Merge branch 'KDE/4.9'

This commit is contained in:
Martin Gräßlin 2012-08-17 20:40:21 +02:00
commit e8e6345290

View file

@ -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 {