summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@digia.com>2014-11-07 16:17:48 +0100
committerAlessandro Portale <alessandro.portale@digia.com>2014-11-12 09:23:18 +0100
commit6f91d7772a59d80e0ad4d21fd44c8ce1ed924860 (patch)
treeabbf9f31762c45fe6e29026dd5363adf5951fb07 /share
parent4cfa58638e619b868cd30635630b8d060e095f99 (diff)
downloadqt-creator-6f91d7772a59d80e0ad4d21fd44c8ce1ed924860.tar.gz
WelcomeScreen theming: Fix button border color
This change adds an additional color role for the border color of a pressed button. Task-number: QTCREATORBUG-13356 Change-Id: Ibdbd330f60063961dbf27dbe2fb90f32089d7b34 Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/themes/dark.creatortheme3
-rw-r--r--share/qtcreator/themes/default.creatortheme3
-rw-r--r--share/qtcreator/welcomescreen/widgets/Button.qml4
3 files changed, 6 insertions, 4 deletions
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index 8f0ea2c5e9..70aba35437 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -84,7 +84,8 @@ ToolBarBackgroundColor=shadowBackground
TreeViewArrowColorNormal=hoverBackground
TreeViewArrowColorSelected=text
Welcome_BackgroundColorNormal=normalBackground
-Welcome_Button_BorderColor=0
+Welcome_Button_BorderColorNormal=0
+Welcome_Button_BorderColorPressed=0
Welcome_Button_TextColorNormal=ffe7e7e7
Welcome_Button_TextColorPressed=ffffffff
Welcome_Caption_TextColorNormal=ff4acb47
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index 8b831be621..4a91e94e2a 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -78,7 +78,8 @@ ToolBarBackgroundColor=ffff0000
TreeViewArrowColorNormal=ffff0000
TreeViewArrowColorSelected=ffff0000
Welcome_BackgroundColorNormal=ffffffff
-Welcome_Button_BorderColor=ff737373
+Welcome_Button_BorderColorNormal=ff737373
+Welcome_Button_BorderColorPressed=ff333333
Welcome_Button_TextColorNormal=ff000000
Welcome_Button_TextColorPressed=ffc0c0c0
Welcome_Caption_TextColorNormal=ff328930
diff --git a/share/qtcreator/welcomescreen/widgets/Button.qml b/share/qtcreator/welcomescreen/widgets/Button.qml
index 7ac6f97e91..c74cd606fa 100644
--- a/share/qtcreator/welcomescreen/widgets/Button.qml
+++ b/share/qtcreator/welcomescreen/widgets/Button.qml
@@ -86,7 +86,7 @@ Button {
color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#232323" : "#eeeeee"
}
}
- border.color: creatorTheme.Welcome_Button_BorderColor
+ border.color: creatorTheme.Welcome_Button_BorderColorNormal
}
Rectangle {
@@ -114,7 +114,7 @@ Button {
color: (creatorTheme.WidgetStyle === 'StyleFlat') ? "#151515" : "#424242"
}
}
- border.color: creatorTheme.Welcome_Button_BorderColor
+ border.color: creatorTheme.Welcome_Button_BorderColorPressed
}
}