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

segmented bar: Selected element always has the checkmark symbol 

This is how Material 3 does it at least.
If we are ever going to implement the iOS style, we need to do it
differently; although there are no icons involved there at all.
This commit is contained in:
Peter Hartmann 2023-01-27 15:33:27 +01:00 committed by uwerat
parent 9d1b2568e5
commit d75c07cbcc
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/controls/QskSegmentedBarSkinlet.cpp
View File

@ -9,6 +9,7 @@
#include "QskGraphic.h" #include "QskGraphic.h"
#include "QskColorFilter.h" #include "QskColorFilter.h"
#include "QskFunctions.h" #include "QskFunctions.h"
#include "QskStandardSymbol.h"
#include "QskSubcontrolLayoutEngine.h" #include "QskSubcontrolLayoutEngine.h"
#include <qfontmetrics.h> #include <qfontmetrics.h>
@ -29,6 +30,19 @@ static inline Qt::Orientation qskOrientation( const QskSegmentedBar* bar )
namespace namespace
{ {
QskGraphic graphicAt( const QskSegmentedBar* bar, const int index )
{
// note: It is a Material 3 peculiarity that the selected element
// always has the checkmark symbol. If we ever have another style
// implementing this control we should put this code into a
// subclass.
const auto graphic = ( bar->selectedIndex() == index )
? QskStandardSymbol::graphic( QskStandardSymbol::CheckMark )
: bar->graphicAt( index );
return graphic;
}
class LayoutEngine : public QskSubcontrolLayoutEngine class LayoutEngine : public QskSubcontrolLayoutEngine
{ {
public: public:
@ -39,7 +53,7 @@ namespace
setGraphicTextElements( bar, setGraphicTextElements( bar,
QskSegmentedBar::Text, bar->textAt( index ), QskSegmentedBar::Text, bar->textAt( index ),
QskSegmentedBar::Graphic, bar->graphicAt( index ).defaultSize() ); QskSegmentedBar::Graphic, graphicAt( bar, index ).defaultSize() );
const auto alignment = bar->alignmentHint( QskSegmentedBar::Panel, Qt::AlignCenter ); const auto alignment = bar->alignmentHint( QskSegmentedBar::Panel, Qt::AlignCenter );
setFixedContent( QskSegmentedBar::Text, Qt::Horizontal, alignment ); setFixedContent( QskSegmentedBar::Text, Qt::Horizontal, alignment );
@ -201,6 +215,14 @@ QSizeF QskSegmentedBarSkinlet::segmentSizeHint( const QskSegmentedBar* bar, Qt::
{ {
LayoutEngine layoutEngine( bar, i ); LayoutEngine layoutEngine( bar, i );
const auto graphic = QskStandardSymbol::graphic( QskStandardSymbol::CheckMark );
// We want to know how big the element can grow when it is selected,
// i.e. when it has the checkmark symbol:
layoutEngine.setGraphicTextElements( bar,
QskSegmentedBar::Text, bar->textAt( i ),
QskSegmentedBar::Graphic, graphic.defaultSize() );
const auto size = layoutEngine.sizeHint( which, QSizeF() ); const auto size = layoutEngine.sizeHint( which, QSizeF() );
if( size.width() > sizeMax.width() ) if( size.width() > sizeMax.width() )
@ -345,7 +367,7 @@ QSGNode* QskSegmentedBarSkinlet::updateSampleNode( const QskSkinnable* skinnable
if ( subControl == Q::Graphic ) if ( subControl == Q::Graphic )
{ {
const auto graphic = bar->graphicAt( index ); const auto graphic = graphicAt( bar, index );
if( !graphic.isEmpty() ) if( !graphic.isEmpty() )
{ {