From 0bfb08b20b1d2fd18c953c433347f09d5a639d4d Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 4 Aug 2021 11:48:14 +0200 Subject: [PATCH] overlapping status bits fixed --- src/controls/QskAbstractButton.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/controls/QskAbstractButton.cpp b/src/controls/QskAbstractButton.cpp index c89e9d01..c215fc0e 100644 --- a/src/controls/QskAbstractButton.cpp +++ b/src/controls/QskAbstractButton.cpp @@ -10,15 +10,11 @@ #include -// Flat/Checkable are no states - we need to get rid of them. TODO ... +// Flat is no state - we need to get rid of it. TODO ... QSK_SYSTEM_STATE( QskAbstractButton, Flat, QskAspect::FirstSystemState << 1 ) -#if 1 -// Wrong: we are overlapping with the user states, TODO ... -QSK_STATE( QskAbstractButton, Checked, QskAspect::LastUserState ) -#endif - -QSK_SYSTEM_STATE( QskAbstractButton, Pressed, QskAspect::LastSystemState >> 3 ) +QSK_SYSTEM_STATE( QskAbstractButton, Checked, QskAspect::LastSystemState >> 3 ) +QSK_SYSTEM_STATE( QskAbstractButton, Pressed, QskAspect::LastSystemState >> 2 ) static QskAbstractButton* qskCheckedSibling( const QskAbstractButton* button ) {