From 270c94f89f042ab9bc6a9e45b6f7c70f1bf2fffb Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 13 Dec 2018 11:25:16 +0100 Subject: [PATCH] QskTextOptions::effectiveElideMode added --- src/common/QskTextOptions.cpp | 8 ++++++++ src/common/QskTextOptions.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/common/QskTextOptions.cpp b/src/common/QskTextOptions.cpp index 9e1ef49b..49e92900 100644 --- a/src/common/QskTextOptions.cpp +++ b/src/common/QskTextOptions.cpp @@ -36,6 +36,14 @@ Qt::TextElideMode QskTextOptions::elideMode() const return m_elideMode; } +Qt::TextElideMode QskTextOptions::effectiveElideMode() const +{ + if ( m_wrapMode != QskTextOptions::NoWrap ) + return Qt::ElideNone; + + return m_elideMode; +} + void QskTextOptions::setWrapMode( WrapMode wrapMode ) { m_wrapMode = wrapMode; diff --git a/src/common/QskTextOptions.h b/src/common/QskTextOptions.h index 4f21dbb5..ec41ef72 100644 --- a/src/common/QskTextOptions.h +++ b/src/common/QskTextOptions.h @@ -60,6 +60,8 @@ class QSK_EXPORT QskTextOptions Qt::TextElideMode elideMode() const; void setElideMode( Qt::TextElideMode ); + Qt::TextElideMode effectiveElideMode() const; + FontSizeMode fontSizeMode() const; void setFontSizeMode( FontSizeMode );