From 93f5552a4ec021e2eeb6b970ed92fffbc4274e8c Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 24 Aug 2017 13:06:20 +0200 Subject: [PATCH] don't fall back on QskAspect::Control, when resolving from the local skin hint table --- src/controls/QskSkinnable.cpp | 5 ++--- src/controls/QskSubWindowArea.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp index 745ba1af..08e59cae 100644 --- a/src/controls/QskSkinnable.cpp +++ b/src/controls/QskSkinnable.cpp @@ -102,10 +102,9 @@ static inline const QVariant& qskResolvedHint( QskAspect::Aspect aspect, if ( aspect.subControl() != QskAspect::Control ) { - // fall back from subcontrol to control - + // trying to resolve from the skin default settings aspect.setSubControl( QskAspect::Control ); - return qskResolvedHint( aspect, controlHints, skinHints, status ); + return qskResolvedHint( aspect, nullptr, skinHints, status ); } // Nothing left to try... diff --git a/src/controls/QskSubWindowArea.cpp b/src/controls/QskSubWindowArea.cpp index 63ba6f68..2ee6985c 100644 --- a/src/controls/QskSubWindowArea.cpp +++ b/src/controls/QskSubWindowArea.cpp @@ -233,7 +233,7 @@ bool QskSubWindowArea::mouseEventFilter( QskSubWindow* window, const QMouseEvent #if 0 // how to handle not to be process visual // changes for double click events ??? - if ( window->titleBarRect().contains( event->localPos() ) + if ( window->titleBarRect().contains( event->localPos() ) ) { // block button press until we know it is no double click ///QGuiApplication::styleHints()->mouseDoubleClickInterval()