[fltk.development] [RFE] STR #2679: Fl_Table: this is patch is changeing size of scrollbar (for the size is takeing from scheme/theme, but do not from constant of source).

[Dmitrij K]

DO NOT REPLY TO THIS MESSAGE.  INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.

[STR New]

Link: http://www.fltk.org/str.php?L2679
Version: 1.3-feature


See the header of STR.


Link: http://www.fltk.org/str.php?L2679
Version: 1.3-feature
--- src/Fl_Table.cxx    2010-12-05 06:22:53.000000000 +0500
+++ src/Fl_Table.cxx    2011-07-13 18:18:30.210000001 +0600
@@ -30,7 +30,6 @@
 #include <FL/fl_utf8.H>        // currently only Windows and Linux
 #endif
 
-#define SCROLLBAR_SIZE 16
 
 // Scroll display so 'row' is at top
 void Fl_Table::row_position(int row) {
@@ -138,13 +137,13 @@
   
   box(FL_THIN_DOWN_FRAME);
   
-  vscrollbar = new Fl_Scrollbar(x()+w()-SCROLLBAR_SIZE, y(),
-                                SCROLLBAR_SIZE, h()-SCROLLBAR_SIZE);
+  vscrollbar = new Fl_Scrollbar(x()+w()-Fl::scrollbar_size(), y(),
+                                Fl::scrollbar_size(), 
h()-Fl::scrollbar_size());
   vscrollbar->type(FL_VERTICAL);
   vscrollbar->callback(scroll_cb, (void*)this);
   
-  hscrollbar = new Fl_Scrollbar(x(), y()+h()-SCROLLBAR_SIZE,
-                                w(), SCROLLBAR_SIZE);
+  hscrollbar = new Fl_Scrollbar(x(), y()+h()-Fl::scrollbar_size(),
+                                w(), Fl::scrollbar_size());
   hscrollbar->type(FL_HORIZONTAL);
   hscrollbar->callback(scroll_cb, (void*)this);
   
@@ -486,13 +485,13 @@
     int hidev = (table_h <= tih);
     int hideh = (table_w <= tiw); 
     // Second pass: Check for interference
-    if ( !hideh & hidev ) { hidev = (( table_h - tih + SCROLLBAR_SIZE ) <= 0 
); } 
-    if ( !hidev & hideh ) { hideh = (( table_w - tiw + SCROLLBAR_SIZE ) <= 0 
); } 
+    if ( !hideh & hidev ) { hidev = (( table_h - tih + Fl::scrollbar_size() ) 
<= 0 ); } 
+    if ( !hidev & hideh ) { hideh = (( table_w - tiw + Fl::scrollbar_size() ) 
<= 0 ); } 
     // Determine scrollbar visibility, trim ti[xywh]/to[xywh]
     if ( hidev ) { vscrollbar->hide(); } 
-    else { vscrollbar->show(); tiw -= SCROLLBAR_SIZE; tow -= SCROLLBAR_SIZE; }
+    else { vscrollbar->show(); tiw -= Fl::scrollbar_size(); tow -= 
Fl::scrollbar_size(); }
     if ( hideh ) { hscrollbar->hide(); } 
-    else { hscrollbar->show(); tih -= SCROLLBAR_SIZE; toh -= SCROLLBAR_SIZE; }
+    else { hscrollbar->show(); tih -= Fl::scrollbar_size(); toh -= 
Fl::scrollbar_size(); }
   } 
   // Resize the child table
   table->resize(tox, toy, tow, toh);
@@ -562,17 +561,17 @@
     vscrollbar->bounds(0, table_h-tih);
     vscrollbar->precision(10);
     vscrollbar->slider_size(vscrolltab);
-    vscrollbar->resize(wix+wiw-SCROLLBAR_SIZE, wiy,
-                       SCROLLBAR_SIZE, 
-                       wih - ((hscrollbar->visible())?SCROLLBAR_SIZE:0));
+    vscrollbar->resize(wix+wiw-Fl::scrollbar_size(), wiy,
+                       Fl::scrollbar_size(), 
+                       wih - ((hscrollbar->visible())?Fl::scrollbar_size():0));
     vscrollbar->Fl_Valuator::value(vscrollbar->clamp(vscrollbar->value()));    
     // Horizontal scrollbar
     hscrollbar->bounds(0, table_w-tiw);
     hscrollbar->precision(10);
     hscrollbar->slider_size(hscrolltab);
-    hscrollbar->resize(wix, wiy+wih-SCROLLBAR_SIZE,
-                       wiw - ((vscrollbar->visible())?SCROLLBAR_SIZE:0), 
-                       SCROLLBAR_SIZE);
+    hscrollbar->resize(wix, wiy+wih-Fl::scrollbar_size(),
+                       wiw - ((vscrollbar->visible())?Fl::scrollbar_size():0), 
+                       Fl::scrollbar_size());
     hscrollbar->Fl_Valuator::value(hscrollbar->clamp(hscrollbar->value()));
   }
   
@@ -1230,7 +1229,7 @@
           //
           fl_rectf(wix, tiy + table_h, row_header_width(), 
                    (wiy+wih) - (tiy+table_h) - 
-                   ( hscrollbar->visible() ? SCROLLBAR_SIZE : 0),
+                   ( hscrollbar->visible() ? Fl::scrollbar_size() : 0),
                    color());
         }
       }

_______________________________________________
fltk-dev mailing list
fltk-dev@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-dev