feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Core: Lazier loading of OutputPaneManageButton images

Browse Source 
Only load button state images when needed.
And not at all with the flat themes.

Change-Id: I2e150eaabab5c91a7230d911bf51cde47b390b04
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2016-07-08 16:20:50 +02:00
parent 2fceaa1bfb
commit 00a9919646
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/coreplugin/outputpanemanager.cpp
View File

@@ -670,12 +670,6 @@ QSize OutputPaneToggleButton::sizeHint() const
void OutputPaneToggleButton::paintEvent(QPaintEvent*) void OutputPaneToggleButton::paintEvent(QPaintEvent*)
{ {
static const QImage panelButton(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/panel_button.png")));
static const QImage panelButtonHover(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/panel_button_hover.png")));
static const QImage panelButtonPressed(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/panel_button_pressed.png")));
static const QImage panelButtonChecked(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/panel_button_checked.png")));
static const QImage panelButtonCheckedHover(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/panel_button_checked_hover.png")));
const QFontMetrics fm = fontMetrics(); const QFontMetrics fm = fontMetrics();
const int baseLine = (height() - fm.height() + 1) / 2 + fm.ascent(); const int baseLine = (height() - fm.height() + 1) / 2 + fm.ascent();
const int numberWidth = fm.width(m_number); const int numberWidth = fm.width(m_number);
@@ -686,7 +680,6 @@ void OutputPaneToggleButton::paintEvent(QPaintEvent*)
styleOption.initFrom(this); styleOption.initFrom(this);
const bool hovered = !HostOsInfo::isMacHost() && (styleOption.state & QStyle::State_MouseOver); const bool hovered = !HostOsInfo::isMacHost() && (styleOption.state & QStyle::State_MouseOver);
const QImage *image = 0;
if (creatorTheme()->flag(Theme::FlatToolBars)) { if (creatorTheme()->flag(Theme::FlatToolBars)) {
Theme::Color c = Theme::BackgroundColorDark; Theme::Color c = Theme::BackgroundColorDark;
@@ -698,12 +691,32 @@ void OutputPaneToggleButton::paintEvent(QPaintEvent*)
if (c != Theme::BackgroundColorDark) if (c != Theme::BackgroundColorDark)
p.fillRect(rect(), creatorTheme()->color(c)); p.fillRect(rect(), creatorTheme()->color(c));
} else { } else {
if (isDown()) const QImage *image = 0;
image = &panelButtonPressed; if (isDown()) {
else if (isChecked()) static const QImage pressed(
image = hovered ? &panelButtonCheckedHover : &panelButtonChecked; StyleHelper::dpiSpecificImageFile(":/core/images/panel_button_pressed.png"));
else image = &pressed;
image = hovered ? &panelButtonHover : &panelButton; } else if (isChecked()) {
if (hovered) {
static const QImage checkedHover(
StyleHelper::dpiSpecificImageFile(":/core/images/panel_button_checked_hover.png"));
image = &checkedHover;
} else {
static const QImage checked(
StyleHelper::dpiSpecificImageFile(":/core/images/panel_button_checked.png"));
image = &checked;
}
} else {
if (hovered) {
static const QImage hover(
StyleHelper::dpiSpecificImageFile(":/core/images/panel_button_hover.png"));
image = &hover;
} else {
static const QImage button(
StyleHelper::dpiSpecificImageFile(":/core/images/panel_button.png"));
image = &button;
}
}
if (image) if (image)
StyleHelper::drawCornerImage(*image, &p, rect(), numberAreaWidth(), buttonBorderWidth, buttonBorderWidth, buttonBorderWidth); StyleHelper::drawCornerImage(*image, &p, rect(), numberAreaWidth(), buttonBorderWidth, buttonBorderWidth, buttonBorderWidth);
} }