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

List:       kde-commits
Subject:    koffice/kexi/widget
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2009-02-21 21:29:05
Message-ID: 1235251745.936867.2478.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 929680 by staniek:

Widgets
= scroll view: remove confusing "Outer area" text, the visual hint based 
  on border should be enough for users to recognize boundary of the form



 M  +11 -0     kexiscrollview.cpp  


--- trunk/koffice/kexi/widget/kexiscrollview.cpp #929679:929680
@@ -36,6 +36,9 @@
 #include <core/kexi.h>
 #include <kexiutils/utils.h>
 
+//disabled #define KEXI_SHOW_OUTERAREA_TEXT
+
+#ifdef KEXI_SHOW_OUTERAREA_TEXT
 //! @internal
 class KexiScrollViewData
 {
@@ -46,6 +49,7 @@
 
 // @todo warning: not reentrant!
 K_GLOBAL_STATIC(KexiScrollViewData, KexiScrollView_data)
+#endif
 
 KexiScrollView::KexiScrollView(QWidget *parent, bool preview)
         : Q3ScrollView(parent)
@@ -162,8 +166,13 @@
         // Ensure there is always space to resize Form
         int w = contentsWidth(), h = contentsHeight();
         bool change = false;
+#ifdef KEXI_SHOW_OUTERAREA_TEXT
         const int delta_x = \
                qMax(KexiScrollView_data->verticalOuterAreaPixmapBuffer.width(), \
                300);
         const int delta_y = \
qMax(KexiScrollView_data->horizontalOuterAreaPixmapBuffer.height(), 300); +#else
+        const int delta_x = 300;
+        const int delta_y = 300;
+#endif
         if ((m_widget->width() + delta_x * 2 / 3) > w) {
             w = m_widget->width() + delta_x;
             change = true;
@@ -345,6 +354,7 @@
         p->drawLine(wx, wy + m_widget->height(), wx + m_widget->width(), wy + \
m_widget->height());  //kDebug() << "KexiScrollView::drawContents() " << \
wy+m_widget->height();  
+#ifdef KEXI_SHOW_OUTERAREA_TEXT
         if (KexiScrollView_data->horizontalOuterAreaPixmapBuffer.isNull()) {
             //create flicker-less buffer
             setupPixmapBuffer(KexiScrollView_data->horizontalOuterAreaPixmapBuffer, \
i18n("Outer Area"), 1); @@ -366,6 +376,7 @@
                 KexiScrollView_data->horizontalOuterAreaPixmapBuffer
             );
         }
+#endif
     }
 }
 


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