Changeset 5ec938e

Timestamp:

08/15/11 20:01:18 (11 years ago)

Author:

gregor herrmann <gregoa@…>

Branches:

master, qt5

Children:

f0e0ac0

Parents:

a9f56bb

Message:

Improve day navigator widget.

(Still black magic, now even with #ifdefs :/)

Location:

src/gui

Files:

• daynavigatorwidget.cpp (modified) (4 diffs)
• daynavigatorwidget.ui (modified) (1 diff)

src/gui/daynavigatorwidget.cpp

@@ -86 +86 @@
         configureNavigation();
         emit(dateChanged(mCurDate));
-        selectedDate->update();
+        this->update();
     }
 }
@@ -97 +97 @@
         configureNavigation();
         emit(dateChanged(mCurDate));
-        selectedDate->update();
+        this->update();
     }
 }
@@ -109 +109 @@
         configureNavigation();
         emit(dateChanged(mCurDate));
-        selectedDate->update();
+        this->update();
     }
 }
@@ -120 +120 @@
     QPainter painter(this);
     painter.save();
-    QRect q(y()-height()+16, x(), height(), width()); // today icon size = 32x32
+
+    // rectangle only for the text
+    int marginSize = 9;
+    int buttonSize = 32;
+#ifdef MAEMO
+    QRect q(y()-height()+1*marginSize+2.5*buttonSize, x(), height()-2*marginSize-2.5*buttonSize, width());
+#else
+    QRect q(y()-height()+1*marginSize+2*buttonSize, x(), height()-2*marginSize-3*buttonSize, width());
+#endif
     painter.rotate(270);
+
+    // font size adjustion, static on maemo, dynamically otherwise
+    QFont f = painter.font();
+#ifdef MAEMO
+    qreal factor = 0.8;
+#else
+    qreal factor = (qreal) 2 * q.width() / painter.fontMetrics().width(selectedDateStr);
+#endif
+    if (factor < 1) f.setPointSizeF(f.pointSizeF() * factor);
+    painter.setFont(f);
+
     painter.drawText(q, Qt::AlignCenter, selectedDateStr);
     painter.restore();

src/gui/daynavigatorwidget.ui

@@ -26 +26 @@
    <item row="1" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
      <item>
       <widget class="QToolButton" name="nextDayButton">