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

wip

This commit is contained in:
Uwe Rathmann 2023-05-15 10:40:33 +02:00
parent b1a816e61e
commit 329efbb242
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/controls/QskMenuSkinlet.cpp
View File

@ -18,6 +18,19 @@
#include <qfontmetrics.h> #include <qfontmetrics.h>
#include <qmath.h> #include <qmath.h>
static inline int qskActionIndex( const QskMenu* menu, int optionIndex )
{
if ( optionIndex < 0 )
return -1;
const auto& actions = menu->actions();
auto it = std::lower_bound(
actions.constBegin(), actions.constEnd(), optionIndex );
return it - actions.constBegin();
}
class QskMenuSkinlet::PrivateData class QskMenuSkinlet::PrivateData
{ {
public: public:
@ -45,20 +58,6 @@ class QskMenuSkinlet::PrivateData
m_segmentHeight = m_segmentWidth = m_graphicWidth = m_textWidth = -1.0; m_segmentHeight = m_segmentWidth = m_graphicWidth = m_textWidth = -1.0;
} }
inline int separatorsBefore( const QskMenu* menu, int index ) const
{
const auto separators = menu->separators();
int i = 0;
for ( ; i < separators.count(); i++ )
{
if ( separators[i] >= index )
break;
}
return i;
}
inline qreal graphicWidth( const QskMenu* menu ) const inline qreal graphicWidth( const QskMenu* menu ) const
{ {
if ( m_isCaching ) if ( m_isCaching )
@ -271,19 +270,18 @@ QRectF QskMenuSkinlet::sampleRect(
if ( subControl == Q::Segment ) if ( subControl == Q::Segment )
{ {
const auto r = menu->subControlContentsRect( Q::Panel ); const auto h = m_data->segmentHeight( menu );
auto h = m_data->segmentHeight( menu ); auto dy = index * h;
if ( int n = m_data->separatorsBefore( menu, index ) ) if ( const auto n = index - qskActionIndex( menu, index ) )
{ {
// spacing ??? // spacing ???
dy += n * menu->metric( Q::Separator | QskAspect::Size );
const qreal separatorH = menu->metric( Q::Separator | QskAspect::Size );
h += n * separatorH;
} }
return QRectF( r.x(), r.y() + index * h, r.width(), h ); const auto r = menu->subControlContentsRect( Q::Panel );
return QRectF( r.x(), r.y() + dy, r.width(), h );
} }
if ( subControl == QskMenu::Icon || subControl == QskMenu::Text ) if ( subControl == QskMenu::Icon || subControl == QskMenu::Text )
@ -353,7 +351,7 @@ int QskMenuSkinlet::sampleCount(
if ( subControl == Q::Segment || subControl == Q::Icon || subControl == Q::Text ) if ( subControl == Q::Segment || subControl == Q::Icon || subControl == Q::Text )
{ {
const auto menu = static_cast< const QskMenu* >( skinnable ); const auto menu = static_cast< const QskMenu* >( skinnable );
return menu->optionsCount() - menu->separators().count(); return menu->actions().count();
} }
if ( subControl == Q::Separator ) if ( subControl == Q::Separator )