From: Philipp Spitzer Date: Wed, 18 Aug 2021 17:56:32 +0000 (+0200) Subject: Partially fix bug Debian BTS #992236 (width of DayNavigatorWidget). X-Git-Tag: 0.7.1~6 X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/commitdiff_plain/6c5eece96f3cc25ddb7b67ecad5c456f3aa1bfcf Partially fix bug Debian BTS #992236 (width of DayNavigatorWidget). https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992236 Could be reproduced by setting environment variable QT_FONT_DPI to 200. --- diff --git a/src/gui/daynavigatorwidget.cpp b/src/gui/daynavigatorwidget.cpp index b35f915..dda40a6 100644 --- a/src/gui/daynavigatorwidget.cpp +++ b/src/gui/daynavigatorwidget.cpp @@ -83,6 +83,14 @@ void DayNavigatorWidget::unsetDates() { this->update(); } +QSize DayNavigatorWidget::minimumSizeHint() const { +#ifdef MAEMO + return QSize(20, 0); +#else + return QSize(fontMetrics().lineSpacing() * 3 / 2, 0); +#endif +} + void DayNavigatorWidget::configureNavigation() { prevDayButton->setDisabled(!mStartDate.isValid() || mCurDate == mStartDate); diff --git a/src/gui/daynavigatorwidget.h b/src/gui/daynavigatorwidget.h index c893605..c1529ed 100644 --- a/src/gui/daynavigatorwidget.h +++ b/src/gui/daynavigatorwidget.h @@ -38,6 +38,7 @@ class DayNavigatorWidget : public QWidget, private Ui::DayNavigatorWidget { QDate curDate() const {return mCurDate;} QDate endDate() const {return mEndDate;} void unsetDates(); + virtual QSize minimumSizeHint() const override; protected: void paintEvent(QPaintEvent *); void configureNavigation(); diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index e3b4fa1..d866c4d 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -26,14 +26,7 @@ - - - - 20 - 0 - - - +