From fb01e4ab8cbf5c2c994849071c83fc8ace192ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 8 Aug 2012 23:14:51 +0200 Subject: [PATCH] Ensure that titleHeight is at least height of buttons Required to properly lay out the title in case of vertical or bottom alignment. BUG: 304822 FIXED-IN: 4.9.1 REVIEW: 105937 --- clients/aurorae/src/qml/aurorae.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/aurorae/src/qml/aurorae.qml b/clients/aurorae/src/qml/aurorae.qml index 633378b158..acd6d7aa37 100644 --- a/clients/aurorae/src/qml/aurorae.qml +++ b/clients/aurorae/src/qml/aurorae.qml @@ -141,7 +141,7 @@ Decoration { horizontalAlignment: auroraeTheme.horizontalAlignment verticalAlignment: auroraeTheme.verticalAlignment elide: Text.ElideRight - height: auroraeTheme.titleHeight + height: Math.max(auroraeTheme.titleHeight, auroraeTheme.buttonHeight * auroraeTheme.buttonSizeFactor) color: decoration.active ? auroraeTheme.activeTextColor : auroraeTheme.inactiveTextColor font: decoration.active ? options.activeTitleFont : options.inactiveTitleFont anchors {