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

Core: Fix some Classic theme regressions

Browse Source 
Commit 15fbfaf2e9 moved many images into
utils, but some paths in the source were not adjusted accordingly.

Change-Id: I6d32754c41455271c0bfcedf0777a38fbeca67ab
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
This commit is contained in:
Alessandro Portale
2016-10-07 12:44:39 +02:00
parent 27e03e6fb6
commit 6526e28bd0
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/manhattanstyle.cpp
View File

@@ -466,9 +466,9 @@ void ManhattanStyle::drawPrimitive(PrimitiveElement element, const QStyleOption
painter->fillRect(backgroundRect, option->palette.base()); painter->fillRect(backgroundRect, option->palette.base());
static const QImage bg(StyleHelper::dpiSpecificImageFile( static const QImage bg(StyleHelper::dpiSpecificImageFile(
QLatin1String(":/core/images/inputfield.png"))); QLatin1String(":/utils/images/inputfield.png")));
static const QImage bg_disabled(StyleHelper::dpiSpecificImageFile( static const QImage bg_disabled(StyleHelper::dpiSpecificImageFile(
QLatin1String(":/core/images/inputfield_disabled.png"))); QLatin1String(":/utils/images/inputfield_disabled.png")));
StyleHelper::drawCornerImage(enabled ? bg : bg_disabled, StyleHelper::drawCornerImage(enabled ? bg : bg_disabled,
painter, option->rect, 5, 5, 5, 5); painter, option->rect, 5, 5, 5, 5);

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

@@ -693,26 +693,26 @@ void OutputPaneToggleButton::paintEvent(QPaintEvent*)
const QImage *image = 0; const QImage *image = 0;
if (isDown()) { if (isDown()) {
static const QImage pressed( static const QImage pressed(
StyleHelper::dpiSpecificImageFile(":/core/images/panel_button_pressed.png")); StyleHelper::dpiSpecificImageFile(":/utils/images/panel_button_pressed.png"));
image = &pressed; image = &pressed;
} else if (isChecked()) { } else if (isChecked()) {
if (hovered) { if (hovered) {
static const QImage checkedHover( static const QImage checkedHover(
StyleHelper::dpiSpecificImageFile(":/core/images/panel_button_checked_hover.png")); StyleHelper::dpiSpecificImageFile(":/utils/images/panel_button_checked_hover.png"));
image = &checkedHover; image = &checkedHover;
} else { } else {
static const QImage checked( static const QImage checked(
StyleHelper::dpiSpecificImageFile(":/core/images/panel_button_checked.png")); StyleHelper::dpiSpecificImageFile(":/utils/images/panel_button_checked.png"));
image = &checked; image = &checked;
} }
} else { } else {
if (hovered) { if (hovered) {
static const QImage hover( static const QImage hover(
StyleHelper::dpiSpecificImageFile(":/core/images/panel_button_hover.png")); StyleHelper::dpiSpecificImageFile(":/utils/images/panel_button_hover.png"));
image = &hover; image = &hover;
} else { } else {
static const QImage button( static const QImage button(
StyleHelper::dpiSpecificImageFile(":/core/images/panel_button.png")); StyleHelper::dpiSpecificImageFile(":/utils/images/panel_button.png"));
image = &button; image = &button;
} }
} }
@@ -794,7 +794,7 @@ void OutputPaneManageButton::paintEvent(QPaintEvent*)
{ {
QPainter p(this); QPainter p(this);
if (!creatorTheme()->flag(Theme::FlatToolBars)) { if (!creatorTheme()->flag(Theme::FlatToolBars)) {
static const QImage button(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/core/images/panel_manage_button.png"))); static const QImage button(StyleHelper::dpiSpecificImageFile(QStringLiteral(":/utils/images/panel_manage_button.png")));
StyleHelper::drawCornerImage(button, &p, rect(), buttonBorderWidth, buttonBorderWidth, buttonBorderWidth, buttonBorderWidth); StyleHelper::drawCornerImage(button, &p, rect(), buttonBorderWidth, buttonBorderWidth, buttonBorderWidth, buttonBorderWidth);
} }
QStyle *s = style(); QStyle *s = style();

2
src/plugins/coreplugin/progressmanager/progressbar.cpp
View File

@@ -297,7 +297,7 @@ void ProgressBar::paintEvent(QPaintEvent *)
p.fillRect(inner, c); p.fillRect(inner, c);
} else { } else {
const static QImage bar(StyleHelper::dpiSpecificImageFile( const static QImage bar(StyleHelper::dpiSpecificImageFile(
QLatin1String(":/core/images/progressbar.png"))); QLatin1String(":/utils/images/progressbar.png")));
StyleHelper::drawCornerImage(bar, &p, rect, 3, 3, 3, 3); StyleHelper::drawCornerImage(bar, &p, rect, 3, 3, 3, 3);
// Draw line and shadow after the gradient fill // Draw line and shadow after the gradient fill