Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
d1c7daff
Commit
d1c7daff
authored
Apr 28, 2010
by
Christian Kamm
Browse files
Styling: Merge Qt Simulator theme changes back into Creator.
Reviewed-by: Jens Bache-Wiig
parent
b2937757
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/libs/utils/stylehelper.cpp
View file @
d1c7daff
...
...
@@ -201,6 +201,14 @@ void StyleHelper::verticalGradient(QPainter *painter, const QRect &spanRect, con
static
void
horizontalGradientHelper
(
QPainter
*
p
,
const
QRect
&
spanRect
,
const
QRect
&
rect
,
bool
lightColored
)
{
if
(
lightColored
)
{
QLinearGradient
shadowGradient
(
rect
.
topLeft
(),
rect
.
bottomLeft
());
shadowGradient
.
setColorAt
(
0
,
0xf0f0f0
);
shadowGradient
.
setColorAt
(
1
,
0xcfcfcf
);
p
->
fillRect
(
rect
,
shadowGradient
);
return
;
}
QColor
base
=
StyleHelper
::
baseColor
(
lightColored
);
QColor
highlight
=
StyleHelper
::
highlightColor
(
lightColored
);
QColor
shadow
=
StyleHelper
::
shadowColor
(
lightColored
);
...
...
src/plugins/coreplugin/manhattanstyle.cpp
View file @
d1c7daff
...
...
@@ -795,13 +795,18 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
else
Utils
::
StyleHelper
::
verticalGradient
(
painter
,
gradientSpan
,
rect
,
drawLightColored
);
painter
->
setPen
(
Utils
::
StyleHelper
::
borderColor
());
if
(
!
drawLightColored
)
painter
->
setPen
(
Utils
::
StyleHelper
::
borderColor
());
else
painter
->
setPen
(
QColor
(
0x888888
));
if
(
horizontal
)
{
// Note: This is a hack to determine if the
// toolbar should draw the top or bottom outline
// (needed for the find toolbar for instance)
QColor
lighter
(
Utils
::
StyleHelper
::
sidebarHighlight
());
if
(
drawLightColored
)
lighter
=
QColor
(
255
,
255
,
255
,
180
);
if
(
widget
&&
widget
->
property
(
"topBorder"
).
toBool
())
{
painter
->
drawLine
(
rect
.
topLeft
(),
rect
.
topRight
());
painter
->
setPen
(
lighter
);
...
...
@@ -817,6 +822,7 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
}
}
break
;
default:
QProxyStyle
::
drawControl
(
element
,
option
,
painter
,
widget
);
break
;
...
...
@@ -887,7 +893,8 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
}
tool
.
rect
=
tool
.
rect
.
adjusted
(
2
,
2
,
-
2
,
-
2
);
drawPrimitive
(
PE_IndicatorArrowDown
,
&
tool
,
painter
,
widget
);
}
else
if
(
toolbutton
->
features
&
QStyleOptionToolButton
::
HasMenu
)
{
}
else
if
(
toolbutton
->
features
&
QStyleOptionToolButton
::
HasMenu
&&
!
widget
->
property
(
"noArrow"
).
toBool
())
{
int
arrowSize
=
6
;
QRect
ir
=
toolbutton
->
rect
.
adjusted
(
1
,
1
,
-
1
,
-
1
);
QStyleOptionToolButton
newBtn
=
*
toolbutton
;
...
...
@@ -968,6 +975,7 @@ void ManhattanStyle::drawComplexControl(ComplexControl control, const QStyleOpti
painter
->
restore
();
}
break
;
default:
QProxyStyle
::
drawComplexControl
(
control
,
option
,
painter
,
widget
);
break
;
...
...
Write
Preview
Supports
Markdown
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