168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

heuristic for initializing the cascading property moved from skin to 

QskMenu
This commit is contained in:
Uwe Rathmann 2022-04-16 12:25:39 +02:00
parent c4f5a4bc93
commit d52453311f
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
skins/material/QskMaterialSkin.cpp
View File

@ -237,8 +237,7 @@ void Editor::setupMenu()
setGradient( Q::Panel, m_pal.baseColor ); setGradient( Q::Panel, m_pal.baseColor );
const bool isCascading = qskMaybeDesktopPlatform(); setFlagHint( Q::Panel | A::Style, false ); // not cascading
setFlagHint( Q::Panel | A::Style, isCascading );
#if 0 #if 0
setPadding( Q::Separator, QMarginsF( 10, 0, 10, 0 ) ); setPadding( Q::Separator, QMarginsF( 10, 0, 10, 0 ) );

10
src/common/QskPlatform.cpp
View File

@ -42,16 +42,10 @@ const QPlatformIntegration* qskPlatformIntegration()
bool qskMaybeDesktopPlatform() bool qskMaybeDesktopPlatform()
{ {
// this is what QC2 is doing for menus ? #if QT_CONFIG(cursor)
#if QT_VERSION >= QT_VERSION_CHECK( 5, 15, 0 )
#if !QT_CONFIG(cursor)
return false;
#endif
#endif
if ( const auto platform = QGuiApplicationPrivate::platformIntegration() ) if ( const auto platform = QGuiApplicationPrivate::platformIntegration() )
return platform->hasCapability( QPlatformIntegration::MultipleWindows ); return platform->hasCapability( QPlatformIntegration::MultipleWindows );
#endif
return false; return false;
} }

3
src/controls/QskMenu.cpp
View File

@ -6,6 +6,7 @@
#include <QskColorFilter.h> #include <QskColorFilter.h>
#include <QskSkinlet.h> #include <QskSkinlet.h>
#include <QskEvent.h> #include <QskEvent.h>
#include <QskPlatform.h>
#include <qvector.h> #include <qvector.h>
#include <qvariant.h> #include <qvariant.h>
@ -85,7 +86,7 @@ QskMenu::~QskMenu()
// has no effect as we do not offer submenus yet. TODO ... // has no effect as we do not offer submenus yet. TODO ...
bool QskMenu::isCascading() const bool QskMenu::isCascading() const
{ {
return flagHint( QskMenu::Panel | QskAspect::Style ); return flagHint( QskMenu::Panel | QskAspect::Style, qskMaybeDesktopPlatform() );
} }
void QskMenu::setCascading( bool on ) void QskMenu::setCascading( bool on )