sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-06 00:05:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Draw layer tree layer item indicators floating on right of viewport

Browse Source 
Also, remove adjustment of layer text rectangle, since veiwport scrolls
horizontally now.
This commit is contained in:
Larry Shaffer 2019-06-19 09:52:23 -06:00
parent d8b5454833
commit 2c98fc6088
No known key found for this signature in database
GPG Key ID: E113FDFD0FBCEC20
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/layertree/qgslayertreeviewitemdelegate.cpp
View File

@ -33,7 +33,7 @@ QgsLayerTreeViewProxyStyle::QgsLayerTreeViewProxyStyle( QgsLayerTreeView *treeVi
QRect QgsLayerTreeViewProxyStyle::subElementRect( QStyle::SubElement element, const QStyleOption *option, const QWidget *widget ) const QRect QgsLayerTreeViewProxyStyle::subElementRect( QStyle::SubElement element, const QStyleOption *option, const QWidget *widget ) const
{ {
if ( element == SE_ItemViewItemText || element == SE_LayerTreeItemIndicator ) if ( element == SE_LayerTreeItemIndicator )
{ {
if ( const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>( option ) ) if ( const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>( option ) )
{ {
@ -42,17 +42,11 @@ QRect QgsLayerTreeViewProxyStyle::subElementRect( QStyle::SubElement element, co
int count = mLayerTreeView->indicators( node ).count(); int count = mLayerTreeView->indicators( node ).count();
if ( count ) if ( count )
{ {
QRect vpr = mLayerTreeView->viewport()->rect();
QRect r = QProxyStyle::subElementRect( SE_ItemViewItemText, option, widget ); QRect r = QProxyStyle::subElementRect( SE_ItemViewItemText, option, widget );
int indiWidth = r.height() * count; int indiWidth = r.height() * count;
int textWidth = r.width() - indiWidth; int vpIndiWidth = vpr.width() - indiWidth;
if ( element == SE_LayerTreeItemIndicator ) return QRect( vpIndiWidth, r.top(), indiWidth, r.height() );
{
return QRect( r.left() + textWidth, r.top(), indiWidth, r.height() );
}
else if ( element == SE_ItemViewItemText )
{
return QRect( r.left(), r.top(), textWidth, r.height() );
}
} }
} }
} }

2
src/gui/layertree/qgslayertreeviewitemdelegate.h
View File

@ -37,7 +37,7 @@ class QgsLayerTreeView;
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
/** /**
* Proxy style to make the item text rect shorter so that indicators fit in without colliding with text * Proxy style for layer items with indicators
*/ */
class QgsLayerTreeViewProxyStyle : public QgsProxyStyle class QgsLayerTreeViewProxyStyle : public QgsProxyStyle
{ {