[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/digital-clock
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-01-03 20:24:46
Message-ID: 1231014286.511338.4480.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 905163 by aseigo:

lineSpacing is too much, let's let it snug up to within 2 pixels
BUG:179506


 M  +4 -4      clock.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/digital-clock/clock.cpp #905162:905163
@@ -394,8 +394,8 @@
         if (m_dateTimezoneBesides) {
             dateRect = sideBySideLayout(subtitleWidth, subtitleHeight, \
contentsRect);  
-            // kDebug(96669) << contentsRect.height()-(subtitleHeight) << \
                metrics.lineSpacing();
-            if (contentsRect.height() - (subtitleHeight) >= metrics.lineSpacing() || \
formFactor() != Plasma::Horizontal) { +            //kDebug(96669) << \
contentsRect.height()-(subtitleHeight); +            if (contentsRect.height() - \
                (subtitleHeight) >= 2 || formFactor() != Plasma::Horizontal) {
                 // to small to display the time on top of the date/timezone
                 // put them side by side
                 // kDebug(96669) << "switching to normal";
@@ -405,8 +405,8 @@
         } else {
             dateRect = normalLayout(subtitleWidth, subtitleHeight, contentsRect);
 
-            // kDebug(96669) << contentsRect.height()-(subtitleHeight) << \
                metrics.lineSpacing();
-            if (contentsRect.height() - (subtitleHeight) < metrics.lineSpacing() && \
formFactor() == Plasma::Horizontal) { +            //kDebug(96669) << \
contentsRect.height()-(subtitleHeight); +            if (contentsRect.height() - \
                (subtitleHeight) < 2 && formFactor() == Plasma::Horizontal) {
                 // to small to display the time on top of the date/timezone
                 // put them side by side
                 // kDebug(96669) << "switching to s-b-s";


[prev in list] [next in list] [prev in thread] [next in thread]