Differential D27669 Diff 81123 kstyle/breezetoolsareamanager.cpp

Changeset View

Standalone View

View Options

kstyle/breezetoolsareamanager.cpp

  • This file was added.
1​#include "breezetoolsareamanager.h"
2​#include <QObject>
3​#include <QWidget>
4​#include <QToolBar>
5​#include <QWindow>
6​#include <QMainWindow>
7​#include <QMoveEvent>
8​#include <QDebug>
9​
10​namespace Breeze {
11​ ToolsAreaManager::ToolsAreaManager(Helper *helper, QObject *parent) : QObject(parent), _helper(helper) {}
12​
13​ ToolsAreaManager::~ToolsAreaManager() {}
14​
15​ void ToolsAreaManager::updateAnimations() {
16​ for (auto entry : animationMap) {
hpereiradacostaUnsubmitted
Done

This is not needed. Since all animations are created as children of the ToolsAreaManager, they should be deleted automatically when this one is destroyed.
This way you can simply remove the class destructor altogether and rely on the default one (from QObject).

hpereiradacosta: This is not needed. Since all animations are created as children of the ToolsAreaManager, they…
17​ entry.foregroundColorAnimation->setStartValue(_helper->titleBarTextColor(false));
18​ entry.foregroundColorAnimation->setEndValue(_helper->titleBarTextColor(true));
19​
20​ entry.backgroundColorAnimation->setStartValue(_helper->titleBarColor(false));
21​ entry.backgroundColorAnimation->setEndValue(_helper->titleBarColor(true));
22​
23​ entry.foregroundColorAnimation->setDuration(
24​ _helper->decorationConfig()->animationsEnabled() ?
25​ _helper->decorationConfig()->animationsDuration() :
26​ 0
27​ );
28​ entry.backgroundColorAnimation->setDuration(
29​ _helper->decorationConfig()->animationsEnabled() ?
30​ _helper->decorationConfig()->animationsDuration() :
31​ 0
32​ );
33​ }
34​ }
35​
36​ void ToolsAreaManager::registerAnimation(QWidget *widget) {
37​ auto window = widget->window()->windowHandle();
38​ if (window && !animationMap.contains(window)) {
39​
40​ auto foregroundColorAnimation = new QVariantAnimation(this);
41​ connect(foregroundColorAnimation, &QVariantAnimation::valueChanged,
42​ this, &ToolsAreaManager::toolbarUpdated);
43​
44​ auto backgroundColorAnimation = new QVariantAnimation(this);
45​ connect(backgroundColorAnimation, &QVariantAnimation::valueChanged,
46​ this, &ToolsAreaManager::toolbarUpdated);
47​
48​ foregroundColorAnimation->setStartValue(_helper->titleBarTextColor(false));
49​ foregroundColorAnimation->setEndValue(_helper->titleBarTextColor(true));
50​
51​ backgroundColorAnimation->setStartValue(_helper->titleBarColor(false));
52​ backgroundColorAnimation->setEndValue(_helper->titleBarColor(true));
53​
54​ foregroundColorAnimation->setDuration(
55​ _helper->decorationConfig()->animationsEnabled() ?
56​ _helper->decorationConfig()->animationsDuration() :
57​ 0
58​ );
59​ backgroundColorAnimation->setDuration(
60​ _helper->decorationConfig()->animationsEnabled() ?
61​ _helper->decorationConfig()->animationsDuration() :
62​ 0
63​ );
64​
65​ animationMap[window] = ToolsAreaAnimation{
66​ foregroundColorAnimation,
67​ backgroundColorAnimation,
68​ window->isActive(),
69​ };
70​
71​ connect(window, &QWindow::activeChanged,
72​ this, [=]() {
73​ if (animationMap[window].foregroundColorAnimation.isNull() || animationMap[window].backgroundColorAnimation.isNull()) return;
74​
75​ auto prevActive = animationMap[window].prevActive;
76​ if (prevActive && !window->isActive()) {
77​ animationMap[window].foregroundColorAnimation->setDirection(QAbstractAnimation::Backward);
78​ animationMap[window].backgroundColorAnimation->setDirection(QAbstractAnimation::Backward);
79​
80​ animationMap[window].foregroundColorAnimation->start();
81​ animationMap[window].backgroundColorAnimation->start();
82​ } else if (!prevActive && window->isActive()) {
83​ animationMap[window].foregroundColorAnimation->setDirection(QAbstractAnimation::Forward);
84​ animationMap[window].backgroundColorAnimation->setDirection(QAbstractAnimation::Forward);
85​
86​ animationMap[window].foregroundColorAnimation->start();
87​ animationMap[window].backgroundColorAnimation->start();
88​ }
89​ animationMap[window].prevActive = window->isActive();
90​ });
91​
92​ }
93​ }
94​
95​ bool ToolsAreaManager::animationRunning(const QWidget *widget) {
96​ auto window = widget->window()->windowHandle();
97​ if (window && animationMap.contains(window)) {
98​ return (
hpereiradacostaUnsubmitted
Done

As far as I have followed the code you need an "unregisterWidget" for when widgets are unpolished and to remove windows from the map.
You also need a connection to the destroyed signal to cleanup the map when a widget is deleted, otherwise you will keep accumulating an ever growing map of dangling pointers.

hpereiradacosta: As far as I have followed the code you need an "unregisterWidget" for when widgets are…
99​ animationMap[window].foregroundColorAnimation->state() == QAbstractAnimation::Running
100​ &&
101​ animationMap[window].backgroundColorAnimation->state() == QAbstractAnimation::Running
102​ );
103​ }
davidreUnsubmitted
Done

This needs at least a comment why we have this hack for telegram

davidre: This needs at least a comment why we have this hack for telegram
104​ return false;
105​ }
106​
107​ QColor ToolsAreaManager::foreground(const QWidget *widget) {
108​ auto window = widget->window()->windowHandle();
109​ if (window && animationMap.contains(window) && animationMap[window].foregroundColorAnimation) {
ngrahamUnsubmitted
Done

This seems to make the window content move vertically when the window loses focus

ngraham: This seems to make the window content move vertically when the window loses focus
cblackAuthorUnsubmitted
Done

Eh? What application do you see this behaviour in?

cblack: Eh? What application do you see this behaviour in?
ngrahamUnsubmitted
Done

All of them with anything besides a titlebar in their Tools area: Dolphin, Gwenview, Okular, Kate, Konsole...

ngraham: All of them with anything besides a titlebar in their Tools area: Dolphin, Gwenview, Okular…
ngrahamUnsubmitted
Done

ngraham: {F8168127}
cblackAuthorUnsubmitted
Done

That's odd—the margin shouldn't be shifting based off of window status. Will investigate.

cblack: That's odd—the margin shouldn't be shifting based off of window status. Will investigate.
cblackAuthorUnsubmitted
Done

I believe this is due to how it determines "should draw tools area" conflicting with your colourscheme.
When active, the window and the titlebar colours are different, thus causing the tools are to be drawn. When inactive, the window and the titlebar colours are the same, causing the tools area to not be drawn.

cblack: I believe this is due to how it determines "should draw tools area" conflicting with your…
hpereiradacostaUnsubmitted
Done

That's still needs fixing though. You cannot have things floating around depending on which color scheme is used. right ?
There are many color schemes of all types in the wild. The widget style must work for all.

hpereiradacosta: That's still needs fixing though. You cannot have things floating around depending on which…
cblackAuthorUnsubmitted
Done

This is intentional—if a window's titlebar and content colours are the same, the window is drawn as a homogeneous window instead of a window with a tools area.

cblack: This is intentional—if a window's titlebar and content colours are the same, the window is…
hpereiradacostaUnsubmitted
Done

I was not refering to the rendering of the separator, but rather to the fact that the widgets margin change between active and inactive. This should not happen (disregarding the color scheme).
All in all, whether you need to draw the separator or not you need to add the margin always (or follow David's suggestion)
Unless I misunderstood the actual issue reported by Nathan of course.

hpereiradacosta: I was not refering to the rendering of the separator, but rather to the fact that the widgets…
110​ return animationMap[window].foregroundColorAnimation->currentValue().value<QColor>();
davidreUnsubmitted
Done

Maybe the decision whether to do this could only be made based on the colors of the active state so it's consistent with the inactive one.
Also this happens because the separator line? Do we actually need it? Currently there is no separator between titlebar and window and/or between toolbar and other window content?

davidre: Maybe the decision whether to do this could only be made based on the colors of the active…
111​ }
112​ return QColor();
113​ }
114​
115​ QColor ToolsAreaManager::background(const QWidget *widget) {
116​ auto window = widget->window()->windowHandle();
117​ if (window && animationMap.contains(window) && animationMap[window].backgroundColorAnimation) {
118​ return animationMap[window].backgroundColorAnimation->currentValue().value<QColor>();
119​ }
120​ return QColor();
121​ }
hpereiradacostaUnsubmitted
Done

the this-> here are all unnecessary.

hpereiradacosta: the this-> here are all unnecessary.
122​
123​ void ToolsAreaManager::registerWindow(QWindow *window)
124​ {
125​ if (!_registeredWindows.contains(window)) {
126​ auto geoUpdate = [=]() {
127​ _helper->_invalidateCachedRects = true;
ndavisUnsubmitted
Not Done

I misclicked. It's this line with _helper->_invalidateCachedRects = true;

ndavis: I misclicked. It's this line with `_helper->_invalidateCachedRects = true;`
128​ emit toolbarUpdated();
ndavisUnsubmitted
Not Done

When I run GDB on oxygen-demo5, sometimes it tells me that oxygen-demo5 crashes on this line. I'm not sure how to make it happen reliably, but it usually involves changing QStyles with the Style combobox or color schemes with the Color Scheme combobox.

ndavis: When I run GDB on `oxygen-demo5`, sometimes it tells me that `oxygen-demo5` crashes on this…
ndavisUnsubmitted
Not Done

Now I can consistently get oxygen-demo5 to crash on this line by switching to Fusion and then Oxygen.

ndavis: Now I can consistently get oxygen-demo5 to crash on this line by switching to Fusion and then…
129​ };
130​ connect(window, &QWindow::widthChanged, geoUpdate);
131​ connect(window, &QWindow::heightChanged, geoUpdate);
132​ connect(window, &QWindow::destroyed, geoUpdate);
133​ _registeredWindows << window;
134​ }
hpereiradacostaUnsubmitted
Done

Did you check that this chunk of code (changing the contents margins of the QMainWindow) has any effect ? I had my doubt so I changed the margin to 100 instead of 1, added a printout to make sure that this line of code is called, then ran dolphin and
1/ the code is indeed called
2/ it changes nothing, on dolphin, okular, ...
if you can confirm, then just drop it.

(in fact, I don't understand the login in the first place: why would you need to add one pixel on top of everything in the QMainWindow ?)

hpereiradacosta: Did you check that this chunk of code (changing the contents margins of the QMainWindow) has…
cblackAuthorUnsubmitted
Done

This only triggers when the window has no items in the tools area—it's used in conjunction with line 878 of breezestyle.cpp in order to render a border at the top of the window.

cblack: This only triggers when the window has no items in the tools area—it's used in conjunction with…
hpereiradacostaUnsubmitted
Done

Clear enough ! Sorry for the noise ! (and not having read the code with enough attention).

hpereiradacosta: Clear enough ! Sorry for the noise ! (and not having read the code with enough attention).
135​ }
136​
137​ bool ToolsAreaManager::eventFilter(QObject *watched, QEvent *event)
138​ {
139​ Q_UNUSED(watched)
140​ if (event->type() == QEvent::Move) {
hpereiradacostaUnsubmitted
Done

more unnecessary "this->"
Please try to remove them all.

hpereiradacosta: more unnecessary "this->" Please try to remove them all.
141​ auto moveEvent = static_cast<QMoveEvent*>(event);
142​ if (moveEvent->oldPos() != moveEvent->pos()) {
143​ Q_EMIT toolbarUpdated();
144​ }
145​ }
146​ return false;
147​ }
hpereiradacostaUnsubmitted
Done

you can break here once one widget is found. no need to loop over the remaining widgets.
alternatively you can use std::any_of or (better) std::none_of

hpereiradacosta: you can break here once one widget is found. no need to loop over the remaining widgets.
148​
149​ void ToolsAreaManager::registerWidget(QWidget *widget)
150​ {
151​ auto win = widget->window();
152​ if (win) {
153​ auto handle = win->windowHandle();
154​ if (handle) {
155​ registerWindow(handle);
156​ }
157​ }
158​ auto window = qobject_cast<QMainWindow*> (widget);
159​ if (window) {
160​ connect(this, &ToolsAreaManager::toolbarUpdated,
hpereiradacostaUnsubmitted
Done

you should also remove the widget from widgetsWithPaletteForToolsAreaSet

hpereiradacosta: you should also remove the widget from widgetsWithPaletteForToolsAreaSet
161​ window, [this, window]() {
162​ if (_helper->toolsAreaHasContents(window)) {
163​ window->setContentsMargins(0,0,0,0);
hpereiradacostaUnsubmitted
Done

Unused

hpereiradacosta: Unused
164​ } else {
165​ window->setContentsMargins(0,1,0,0);
166​ }
167​ });
168​ }
169​ connect(this, &ToolsAreaManager::toolbarUpdated,
170​ widget, [widget, this]() {
171​ widget->update();
172​ auto win = widget->window();
173​ if (win) {
174​ auto handle = win->windowHandle();
175​ if (handle) {
176​ _helper->_cachedRects.remove(handle);
177​ widget->update();
178​ }
179​ }
180​ });
181​ auto toolbar = qobject_cast<QToolBar*>(widget);
182​ if (toolbar) {
183​ connect(this, &ToolsAreaManager::toolbarUpdated,
184​ widget, [=]() {
185​ const auto rect = _helper->toolsAreaToolbarsRect(widget);
186​ if (rect.bottom() != widget->geometry().bottom()) {
187​ toolbar->setContentsMargins(0,0,0,0);
188​ } else {
189​ toolbar->setContentsMargins(0,0,0,4);
190​ }
191​ });
192​ connect(toolbar, &QToolBar::visibilityChanged,
193​ this, [this]() {
194​ emit toolbarUpdated();
195​ });
196​ connect(toolbar, &QToolBar::orientationChanged,
197​ this, [this]() {
198​ emit toolbarUpdated();
199​ });
200​ connect(toolbar, &QToolBar::topLevelChanged,
201​ this, [this]() {
202​ emit toolbarUpdated();
203​ });
204​ if (!toolbar->property("__breezeEventFilter").isValid()) {
205​ toolbar->installEventFilter(this);
206​ }
207​ }
208​ connect(widget, &QObject::destroyed,
209​ this, [this, widget]() {
210​ unregisterWidget(widget);
211​ });
212​ registerAnimation(widget);
213​ _registeredWidgets << widget;
214​ emit toolbarUpdated();
215​ }
216​
217​ bool ToolsAreaManager::widgetHasCorrectPaletteSet(const QWidget *widget)
218​ {
219​ if (animationRunning(widget)) return true;
220​ return (
221​ widget->palette().color(QPalette::Window) == background(widget)
222​ &&
223​ widget->palette().color(QPalette::WindowText) == foreground(widget)
224​ );
225​ }
226​
227​ void ToolsAreaManager::unregisterWidget(QWidget *widget)
228​ {
229​ if (qobject_cast<QToolBar*>(widget)) {
230​ widget->setContentsMargins(0,0,0,0);
231​ if (widget->property("__breezeEventFilter").isValid()) {
232​ widget->removeEventFilter(this);
233​ }
234​ }
235​ _registeredWidgets.remove(widget);
236​ QList<QWindow*> toRemove;
237​ for (auto window : animationMap.keys()) {
238​ if (std::none_of(_registeredWidgets.begin(), _registeredWidgets.end(), [window](QWidget *widget) {
239​ return window == widget->window()->windowHandle();
240​ })) {
241​ delete animationMap[window].foregroundColorAnimation;
242​ delete animationMap[window].backgroundColorAnimation;
243​ toRemove << window;
244​ }
245​ }
246​ for (auto entry : toRemove) {
247​ animationMap.remove(entry);
248​ }
249​ }
250​}
251​No newline at end of file