1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draw disabled text color for inactive window decorations

Browse Source 
Task-number: QTBUG-68834
Change-Id: Iced478d12b56fc360c0d824cf5876855d887f9a2
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
This commit is contained in:
Johan Klokkhammer Helsing 2018-06-16 22:37:38 +02:00 committed by Johan Helsing
parent f6fd704557
commit 4d87e7e34b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/wayland/plugins/decorations/bradient/main.cpp
View File

@ -87,6 +87,7 @@ private:
QRectF minimizeButtonRect() const; QRectF minimizeButtonRect() const;
QColor m_foregroundColor; QColor m_foregroundColor;
QColor m_foregroundInactiveColor;
QColor m_backgroundColor; QColor m_backgroundColor;
QStaticText m_windowTitle; QStaticText m_windowTitle;
Button m_clicking = None; Button m_clicking = None;
@ -99,6 +100,7 @@ QWaylandBradientDecoration::QWaylandBradientDecoration()
QPalette palette; QPalette palette;
m_foregroundColor = palette.color(QPalette::Active, QPalette::WindowText); m_foregroundColor = palette.color(QPalette::Active, QPalette::WindowText);
m_backgroundColor = palette.color(QPalette::Active, QPalette::Window); m_backgroundColor = palette.color(QPalette::Active, QPalette::Window);
m_foregroundInactiveColor = palette.color(QPalette::Disabled, QPalette::WindowText);
QTextOption option(Qt::AlignHCenter | Qt::AlignVCenter); QTextOption option(Qt::AlignHCenter | Qt::AlignVCenter);
option.setWrapMode(QTextOption::NoWrap); option.setWrapMode(QTextOption::NoWrap);
@ -181,7 +183,7 @@ void QWaylandBradientDecoration::paint(QPaintDevice *device)
p.save(); p.save();
p.setClipRect(titleBar); p.setClipRect(titleBar);
p.setPen(m_foregroundColor); p.setPen(window()->isActive() ? m_foregroundColor : m_foregroundInactiveColor);
QSizeF size = m_windowTitle.size(); QSizeF size = m_windowTitle.size();
int dx = (top.width() - size.width()) /2; int dx = (top.width() - size.width()) /2;
int dy = (top.height()- size.height()) /2; int dy = (top.height()- size.height()) /2;
@ -197,7 +199,7 @@ void QWaylandBradientDecoration::paint(QPaintDevice *device)
QRectF rect; QRectF rect;
// Default pen // Default pen
QPen pen(m_foregroundColor); QPen pen(window()->isActive() ? m_foregroundColor : m_foregroundInactiveColor);
p.setPen(pen); p.setPen(pen);
// Close button // Close button

7
src/plugins/platforms/wayland/qwaylanddisplay.cpp
View File

@ -41,6 +41,7 @@
#include "qwaylandintegration_p.h" #include "qwaylandintegration_p.h"
#include "qwaylandwindow_p.h" #include "qwaylandwindow_p.h"
#include "qwaylandabstractdecoration_p.h"
#include "qwaylandscreen_p.h" #include "qwaylandscreen_p.h"
#include "qwaylandcursor_p.h" #include "qwaylandcursor_p.h"
#include "qwaylandinputdevice_p.h" #include "qwaylandinputdevice_p.h"
@ -407,6 +408,9 @@ void QWaylandDisplay::handleWindowActivated(QWaylandWindow *window)
mActiveWindows.append(window); mActiveWindows.append(window);
requestWaylandSync(); requestWaylandSync();
if (auto *decoration = window->decoration())
decoration->update();
} }
void QWaylandDisplay::handleWindowDeactivated(QWaylandWindow *window) void QWaylandDisplay::handleWindowDeactivated(QWaylandWindow *window)
@ -417,6 +421,9 @@ void QWaylandDisplay::handleWindowDeactivated(QWaylandWindow *window)
requestWaylandSync(); requestWaylandSync();
mActiveWindows.removeOne(window); mActiveWindows.removeOne(window);
if (auto *decoration = window->decoration())
decoration->update();
} }
void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevice) void QWaylandDisplay::handleKeyboardFocusChanged(QWaylandInputDevice *inputDevice)