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
System
Dolphin
Commits
4a0dbdea
Commit
4a0dbdea
authored
Jul 05, 2020
by
Zren (Chris Holland)
Committed by
Elvis Angelaccio
Nov 04, 2020
Browse files
Cleanup unused colors. Use const. Use KColorScheme danger.
The draw code is more like the last state of D21312 now.
parent
89ede4b9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/panels/places/placesitemlistwidget.cpp
View file @
4a0dbdea
...
...
@@ -6,15 +6,17 @@
#include
"placesitemlistwidget.h"
#include
<QDebug>
//
#include <QDebug>
#include
<QDateTime>
#include
<QGraphicsView>
#include
<QStyleOption>
#include
<K
IO/FileSystemFreeSpaceJob
>
#include
<K
ColorScheme
>
#include
<KMountPoint>
#include
<KIO/FileSystemFreeSpaceJob>
#define CAPACITYBAR_HEIGHT 2
#define CAPACITYBAR_MARGIN 2
...
...
@@ -110,7 +112,7 @@ void PlacesItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsIt
if
(
textInfo
)
{
// See KStandarItemListWidget::paint() for info on why we check textInfo.
painter
->
save
();
QRect
capacityRect
(
const
QRect
capacityRect
(
textInfo
->
pos
.
x
(),
option
->
rect
.
top
()
+
option
->
rect
.
height
()
-
CAPACITYBAR_HEIGHT
-
CAPACITYBAR_MARGIN
,
qMin
((
qreal
)
option
->
rect
.
width
(),
selectionRect
().
width
())
-
(
textInfo
->
pos
.
x
()
-
option
->
rect
.
left
()),
...
...
@@ -119,42 +121,23 @@ void PlacesItemListWidget::paint(QPainter* painter, const QStyleOptionGraphicsIt
const
QPalette
pal
=
palette
();
const
QPalette
::
ColorGroup
group
=
isActiveWindow
()
?
QPalette
::
Active
:
QPalette
::
Inactive
;
// QColor bgColor = QColor::fromRgb(230, 230, 230);
// QColor outlineColor = QColor::fromRgb(208, 208, 208);
// QColor bgColor = QColor::fromRgb(0, 230, 0);
// QColor outlineColor = QColor::fromRgb(208, 0, 0, 127);
// QColor normalUsedColor = QColor::fromRgb(38, 160, 218);
// QColor dangerUsedColor = QColor::fromRgb(218, 38, 38);
// QColor bgColor = pal.base().color().darker(130);
// QColor outlineColor = pal.base().color().darker(150);
QPalette
::
ColorRole
role
;
// role = isSelected() ? QPalette::Highlight : QPalette::Window;
// QColor bgColor = styleOption().palette.color(group, role).darker(150);
// QColor outlineColor = styleOption().palette.color(group, role).darker(170);
QColor
bgColor
=
isSelected
()
?
styleOption
().
palette
.
color
(
group
,
QPalette
::
Highlight
).
darker
(
180
)
:
styleOption
().
palette
.
color
(
group
,
QPalette
::
Window
).
darker
(
120
);
role
=
isSelected
()
?
QPalette
::
HighlightedText
:
QPalette
::
Highlight
;
QColor
normalUsedColor
=
styleOption
().
palette
.
color
(
group
,
role
);
QColor
dangerUsedColor
=
QColor
::
fromRgb
(
218
,
38
,
38
);
// Background
painter
->
fillRect
(
capacityRect
,
bgColor
);
const
QColor
bgColor
=
isSelected
()
?
pal
.
color
(
group
,
QPalette
::
Highlight
).
darker
(
180
)
:
pal
.
color
(
group
,
QPalette
::
Window
).
darker
(
120
);
// Outline
// const QRect outlineRect(capacityRect.x(), capacityRect.y(), capacityRect.width() - 1, capacityRect.height() - 1);
// painter->setPen(outlineColor);
// painter->drawRect(outlineRect);
painter
->
fillRect
(
capacityRect
,
bgColor
);
// Fill
const
QRect
fillRect
(
capacityRect
.
x
(),
capacityRect
.
y
(),
capacityRect
.
width
()
*
m_freeSpaceInfo
.
usedRatio
,
capacityRect
.
height
());
if
(
m_freeSpaceInfo
.
usedRatio
<
0.95
)
{
// Fill
painter
->
fillRect
(
fillRect
,
normalUsedColor
);
}
else
{
if
(
m_freeSpaceInfo
.
usedRatio
>=
0.95
)
{
// More than 95% full!
const
QColor
dangerUsedColor
=
KColorScheme
(
group
,
KColorScheme
::
View
).
foreground
(
KColorScheme
::
NegativeText
).
color
();
painter
->
fillRect
(
fillRect
,
dangerUsedColor
);
}
else
{
const
QPalette
::
ColorRole
role
=
isSelected
()
?
QPalette
::
HighlightedText
:
QPalette
::
Highlight
;
const
QColor
normalUsedColor
=
styleOption
().
palette
.
color
(
group
,
role
);
painter
->
fillRect
(
fillRect
,
normalUsedColor
);
}
painter
->
restore
();
...
...
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