Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Tusooa Zhu
Krita
Commits
0b02df0a
Commit
0b02df0a
authored
Sep 21, 2014
by
Wolthera van Hövell
🛍
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup.
Removing some copiler errors.
parent
b4f8143e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
10 deletions
+6
-10
krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_combo_box.cpp
...rs/advancedcolorselector/kis_color_selector_combo_box.cpp
+3
-5
krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_combo_box.h
...kers/advancedcolorselector/kis_color_selector_combo_box.h
+1
-1
krita/plugins/extensions/dockers/colorslider/kis_hsv_slider.h
...a/plugins/extensions/dockers/colorslider/kis_hsv_slider.h
+2
-4
No files found.
krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_combo_box.cpp
View file @
0b02df0a
...
...
@@ -160,7 +160,7 @@ protected:
KisColorSelectorComboBox
*
parent
=
dynamic_cast
<
KisColorSelectorComboBox
*>
(
this
->
parent
());
Q_ASSERT
(
parent
);
parent
->
setConfiguration
(
m_lastActiveConfiguration
);
setList
(
parent
->
m_model
);
//
setList(parent->m_model);
}
//qDebug()<<"mousepress";
hide
();
...
...
@@ -173,8 +173,7 @@ protected:
KisColorSelectorComboBox
::
KisColorSelectorComboBox
(
QWidget
*
parent
)
:
QComboBox
(
parent
),
m_private
(
new
KisColorSelectorComboBoxPrivate
(
this
)),
m_currentSelector
(
this
),
m_model
(
0
)
m_currentSelector
(
this
)
{
QLayout
*
layout
=
new
QGridLayout
(
this
);
layout
->
addWidget
(
&
m_currentSelector
);
...
...
@@ -239,6 +238,5 @@ void KisColorSelectorComboBox::setConfiguration(KisColorSelector::Configuration
void
KisColorSelectorComboBox
::
setList
(
int
model
)
{
m_model
=
model
;
m_private
->
setList
(
m_model
);
m_private
->
setList
(
model
);
}
krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_combo_box.h
View file @
0b02df0a
...
...
@@ -34,7 +34,7 @@ public:
void
hidePopup
();
void
showPopup
();
KisColorSelector
::
Configuration
configuration
()
const
;
int
m_model
;
//
int m_model;
protected:
void
paintEvent
(
QPaintEvent
*
e
);
public
slots
:
...
...
krita/plugins/extensions/dockers/colorslider/kis_hsv_slider.h
View file @
0b02df0a
...
...
@@ -48,14 +48,12 @@ public:
KisDisplayColorConverter
*
converter
()
const
;
protected:
virtual
void
drawContents
(
QPainter
*
);
KoColorDisplayRendererInterface
*
m_displayRenderer
;
KisCanvas2
*
m_canvas
;
protected:
struct
Private
;
Private
*
const
d
;
private:
qreal
R
,
G
,
B
;
KoColorDisplayRendererInterface
*
m_displayRenderer
;
KisCanvas2
*
m_canvas
;
};
#endif
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