Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt::WidgetAttribute cleanup

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-06-07 13:55:34 +00:00
parent 6611ddee5b
commit ff73506f0c
4 changed files with 34 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/core/global/qnamespace.h
View file

@ -322,56 +322,53 @@ public:
WA_WindowPropagation = 56, WA_WindowPropagation = 56,
WA_TintedBackground = 57, WA_AlwaysShowToolTips = 57,
WA_AlwaysShowToolTips = 58, WA_SetStyle = 58,
WA_SetStyle = 59,
WA_SetLocale = 60, WA_SetLocale = 59,
WA_LayoutUsesWidgetRect = 61, WA_LayoutUsesWidgetRect = 60,
WA_StyledBackground = 62, // internal WA_StyledBackground = 61, // internal
WA_CanHostQMdiSubWindowTitleBar = 63, // Internal
WA_StyleSheet = 64, // internal WA_StyleSheet = 62, // internal
WA_ShowWithoutActivating = 65, WA_ShowWithoutActivating = 63,
WA_X11BypassTransientForHint = 66, WA_X11BypassTransientForHint = 64,
WA_NativeWindow = 67, WA_NativeWindow = 65,
WA_DontCreateNativeAncestors = 68, WA_DontCreateNativeAncestors = 66,
WA_DontShowOnScreen = 69, WA_DontShowOnScreen = 67,
// window types from http://standards.freedesktop.org/wm-spec/ // window types from http://standards.freedesktop.org/wm-spec/
WA_X11NetWmWindowTypeDesktop = 70, WA_X11NetWmWindowTypeDesktop = 68,
WA_X11NetWmWindowTypeDock = 71, WA_X11NetWmWindowTypeDock = 69,
WA_X11NetWmWindowTypeToolBar = 72, WA_X11NetWmWindowTypeToolBar = 70,
WA_X11NetWmWindowTypeMenu = 73, WA_X11NetWmWindowTypeMenu = 71,
WA_X11NetWmWindowTypeUtility = 74, WA_X11NetWmWindowTypeUtility = 72,
WA_X11NetWmWindowTypeSplash = 75, WA_X11NetWmWindowTypeSplash = 73,
WA_X11NetWmWindowTypeDialog = 76, WA_X11NetWmWindowTypeDialog = 74,
WA_X11NetWmWindowTypeDropDownMenu = 77, WA_X11NetWmWindowTypeDropDownMenu = 75,
WA_X11NetWmWindowTypePopupMenu = 78, WA_X11NetWmWindowTypePopupMenu = 76,
WA_X11NetWmWindowTypeToolTip = 79, WA_X11NetWmWindowTypeToolTip = 77,
WA_X11NetWmWindowTypeNotification = 80, WA_X11NetWmWindowTypeNotification = 78,
WA_X11NetWmWindowTypeCombo = 81, WA_X11NetWmWindowTypeCombo = 79,
WA_X11NetWmWindowTypeDND = 82, WA_X11NetWmWindowTypeDND = 80,
WA_SetWindowModality = 83, WA_SetWindowModality = 81,
WA_WState_WindowOpacitySet = 84, // internal WA_TranslucentBackground = 82,
WA_TranslucentBackground = 85,
WA_AcceptTouchEvents = 86, WA_AcceptTouchEvents = 83,
WA_WState_AcceptedTouchBeginEvent = 87, WA_WState_AcceptedTouchBeginEvent = 84,
WA_TouchPadAcceptSingleTouchEvents = 88, WA_TouchPadAcceptSingleTouchEvents = 85,
WA_LockPortraitOrientation = 89, WA_LockPortraitOrientation = 86,
WA_LockLandscapeOrientation = 90, WA_LockLandscapeOrientation = 87,
WA_AutoOrientation = 91, WA_AutoOrientation = 88,
WA_X11DoNotAcceptFocus = 92, WA_X11DoNotAcceptFocus = 89,
WA_NoX11EventCompression = 93, WA_NoX11EventCompression = 90,
// Add new attributes before this line // Add new attributes before this line
WA_AttributeCount WA_AttributeCount

3
src/core/global/qnamespace.qdoc
View file

@ -1083,13 +1083,10 @@
\omitvalue WA_DontShowOnScreen \omitvalue WA_DontShowOnScreen
\omitvalue WA_InvalidSize \omitvalue WA_InvalidSize
\omitvalue WA_ForceUpdatesDisabled \omitvalue WA_ForceUpdatesDisabled
\omitvalue WA_TintedBackground
\omitvalue WA_CanHostQMdiSubWindowTitleBar
\omitvalue WA_AttributeCount \omitvalue WA_AttributeCount
\omitvalue WA_StyleSheet \omitvalue WA_StyleSheet
\omitvalue WA_X11BypassTransientForHint \omitvalue WA_X11BypassTransientForHint
\omitvalue WA_SetWindowModality \omitvalue WA_SetWindowModality
\omitvalue WA_WState_WindowOpacitySet
\omitvalue WA_WState_AcceptedTouchBeginEvent \omitvalue WA_WState_AcceptedTouchBeginEvent
\omitvalue WA_NoX11EventCompression \omitvalue WA_NoX11EventCompression
*/ */

8
src/gui/kernel/qwidget.cpp
View file

@ -4828,13 +4828,6 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
if (!sharedPainter) if (!sharedPainter)
paintEngine->d_func()->systemClip = toBePainted.translated(offset); paintEngine->d_func()->systemClip = toBePainted.translated(offset);
if (!onScreen && !asRoot && !isOpaque && q->testAttribute(Qt::WA_TintedBackground)) {
QPainter p(q);
QColor tint = q->palette().window().color();
tint.setAlphaF(qreal(.6));
p.fillRect(toBePainted.boundingRect(), tint);
}
} }
#if 0 #if 0
@ -9537,7 +9530,6 @@ void QWidget::setWindowOpacity(qreal opacity)
opacity = qBound(qreal(0.0), opacity, qreal(1.0)); opacity = qBound(qreal(0.0), opacity, qreal(1.0));
QTLWExtra *extra = d->topData(); QTLWExtra *extra = d->topData();
extra->opacity = uint(opacity * 255); extra->opacity = uint(opacity * 255);
setAttribute(Qt::WA_WState_WindowOpacitySet);
if (!testAttribute(Qt::WA_WState_Created)) if (!testAttribute(Qt::WA_WState_Created))
return; return;

3
src/gui/widgets/qmdisubwindow.cpp
View file

@ -1715,9 +1715,6 @@ void QMdiSubWindowPrivate::sizeParameters(int *margin, int *minWidth) const
bool QMdiSubWindowPrivate::drawTitleBarWhenMaximized() const bool QMdiSubWindowPrivate::drawTitleBarWhenMaximized() const
{ {
Q_Q(const QMdiSubWindow); Q_Q(const QMdiSubWindow);
if (q->window()->testAttribute(Qt::WA_CanHostQMdiSubWindowTitleBar))
return false;
if (isChildOfTabbedQMdiArea(q)) if (isChildOfTabbedQMdiArea(q))
return false; return false;