From 05bfbe83acdf248608addf35447c1c257adb1d2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 9 Jan 2019 10:00:13 +0100 Subject: [PATCH] [escher/pointer_text_view] Clean minimalSizeForOptimalDisplay It was unneedingly overriden + added escape case on nullptr text --- escher/include/escher/pointer_text_view.h | 1 - escher/src/pointer_text_view.cpp | 4 ---- escher/src/text_view.cpp | 3 +++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/escher/include/escher/pointer_text_view.h b/escher/include/escher/pointer_text_view.h index 432ee3147..bb2ec650d 100644 --- a/escher/include/escher/pointer_text_view.h +++ b/escher/include/escher/pointer_text_view.h @@ -10,7 +10,6 @@ public: KDColor textColor = KDColorBlack, KDColor backgroundColor = KDColorWhite); const char * text() const override { return m_text; } void setText(const char * text) override; - KDSize minimalSizeForOptimalDisplay() const override; private: const char * m_text; }; diff --git a/escher/src/pointer_text_view.cpp b/escher/src/pointer_text_view.cpp index 892311ee5..59d239050 100644 --- a/escher/src/pointer_text_view.cpp +++ b/escher/src/pointer_text_view.cpp @@ -14,7 +14,3 @@ void PointerTextView::setText(const char * text) { markRectAsDirty(bounds()); } } - -KDSize PointerTextView::minimalSizeForOptimalDisplay() const { - return m_font->stringSize(text()); -} diff --git a/escher/src/text_view.cpp b/escher/src/text_view.cpp index 610816b33..b799a8fe0 100644 --- a/escher/src/text_view.cpp +++ b/escher/src/text_view.cpp @@ -33,6 +33,9 @@ void TextView::setFont(const KDFont * font) { } KDSize TextView::minimalSizeForOptimalDisplay() const { + if (text() == nullptr) { + return KDSize(0,0); + } return m_font->stringSize(text()); }