Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Miguel Lopez
Krita
Commits
a7ca1362
Commit
a7ca1362
authored
Jan 10, 2015
by
Halla Rempt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't cache the palette, it can change during the lifetime of the app
Besides, on startup, theme hasn't been set, even.
parent
f20c614b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
krita/ui/kis_paintop_box.cc
krita/ui/kis_paintop_box.cc
+9
-8
krita/ui/kis_paintop_box.h
krita/ui/kis_paintop_box.h
+0
-3
No files found.
krita/ui/kis_paintop_box.cc
View file @
a7ca1362
...
...
@@ -108,8 +108,6 @@ KisPaintopBox::KisPaintopBox(KisViewManager *view, QWidget *parent, const char *
setWindowTitle
(
i18n
(
"Painter's Toolchest"
));
if
(
parent
)
palette
=
parent
->
palette
();
m_settingsWidget
=
new
KisPopupButton
(
this
);
m_settingsWidget
->
setIcon
(
koIcon
(
"paintop_settings_02"
));
m_settingsWidget
->
setToolTip
(
i18n
(
"Edit brush settings"
));
...
...
@@ -985,12 +983,15 @@ void KisPaintopBox::slotToggleAlphaLockMode(bool checked)
void
KisPaintopBox
::
toggleHighlightedButton
(
QToolButton
*
m_tool
)
{
palette_highlight
.
setColor
(
QPalette
::
Button
,
palette
.
color
(
QPalette
::
Highlight
));
if
(
m_tool
->
isChecked
())
m_tool
->
setPalette
(
this
->
palette_highlight
);
else
m_tool
->
setPalette
(
this
->
palette
);
QPalette
p
=
palette
();
if
(
m_tool
->
isChecked
())
{
QPalette
palette_highlight
(
p
);
palette_highlight
.
setColor
(
QPalette
::
Button
,
p
.
color
(
QPalette
::
Highlight
));
m_tool
->
setPalette
(
palette_highlight
);
}
else
{
m_tool
->
setPalette
(
p
);
}
}
void
KisPaintopBox
::
slotReloadPreset
()
{
...
...
krita/ui/kis_paintop_box.h
View file @
a7ca1362
...
...
@@ -191,9 +191,6 @@ private:
QString
m_currCompositeOpID
;
KisNodeWSP
m_previousNode
;
QPalette
palette
;
QPalette
palette_highlight
;
int
normalBrushSize
;
// when toggling between eraser mode
int
eraserBrushSize
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment