Changeset 8350

Timestamp:

01/02/12 17:55:08 (4 months ago)

Author:

westram

Message:

• moved calculation of scrolled area (considering scrollbar indents) into method AW_window::get_scrollarea_size()
  • made involved member variables private
  • removed obsolete bottom indentation
• DRYed more in calculate_scrollbars()

Location:

branches/e4fix/WINDOW

Files:

• AW_window.cxx (modified) (10 diffs)
• aw_common.hxx (modified) (1 diff)
• aw_window.hxx (modified) (5 diffs)

branches/e4fix/WINDOW/AW_window.cxx

@@ -403 +403 @@
 
 void AW_window::calculate_scrollbars() {
-    AW_screen_area screen;
-    this->_get_area_size(AW_MIDDLE_AREA, &screen);
+    AW_screen_area scrollArea;
+    get_scrollarea_size(&scrollArea);
 
     // HORIZONTAL
@@ -414 +414 @@
         }
 
-        bool      use_horizontal_bar     = true;
-        const int scrolled_area_width    = int(screen.r-left_indent_of_horizontal_scrollbar);
-        int       slider_size_horizontal = scrolled_area_width;
+        bool use_horizontal_bar     = true;
+        int  slider_size_horizontal = scrollArea.r;
 
         if (slider_size_horizontal < 1) slider_size_horizontal = 1; // ist der slider zu klein (<1) ?
@@ -434 +433 @@
         }
         // Anpassung fuer resize, wenn unbeschriebener Bereich vergroessert wird
-        if (-slider_pos_horizontal + get_scrolled_picture_width() < scrolled_area_width) {
-            if (use_horizontal_bar) {
-                slider_pos_horizontal = (int)(get_scrolled_picture_width() - scrolled_area_width);
-            }
-            else {
-                slider_pos_horizontal = 0; // slider nach ganz oben, da alles sichtbar
-            }
+        int max_slider_pos = (int)(get_scrolled_picture_width() - scrollArea.r);
+        if (slider_pos_horizontal>max_slider_pos) {
+            slider_pos_horizontal = use_horizontal_bar ? max_slider_pos : 0;
         }
 
@@ -458 +453 @@
         }
 
-        bool      use_vertical_bar     = true;
-        const int scrolled_area_height = int(screen.b-top_indent_of_vertical_scrollbar-bottom_indent_of_vertical_scrollbar);
-        int       slider_size_vertical = scrolled_area_height;
+        bool use_vertical_bar     = true;
+        int  slider_size_vertical = scrollArea.b;
 
         if (slider_size_vertical < 1) slider_size_vertical = 1;
@@ -478 +472 @@
         }
         // Anpassung fuer resize, wenn unbeschriebener Bereich vergroessert wird
-        if (-slider_pos_vertical + get_scrolled_picture_height() < scrolled_area_height) {
-            if (use_vertical_bar) {
-                slider_pos_vertical = (int)(get_scrolled_picture_height() - scrolled_area_height);
-            }
-            else {
-                slider_pos_vertical = 0; // slider nach ganz oben, da alles sichtbar
-            }
-        }
+        int max_slider_pos = (int)(get_scrolled_picture_height() - scrollArea.b);
+        if (slider_pos_vertical>max_slider_pos) {
+            slider_pos_vertical = use_vertical_bar ? max_slider_pos : 0;
+        }
+
         XtVaSetValues(p_w->scroll_bar_vertical, XmNsliderSize, 1, NULL);
         XtVaSetValues(p_w->scroll_bar_vertical, XmNmaximum, slider_max, NULL);
@@ -495 +486 @@
 
 void AW_window::set_vertical_scrollbar_position(int position) {
+#if defined(DEBUG)
+    fprintf(stderr, "set_vertical_scrollbar_position to %i\n", position);
+#endif
+    // @@@ test and constrain against limits
     slider_pos_vertical = position;
     XtVaSetValues(p_w->scroll_bar_vertical, XmNvalue, position, NULL);
@@ -500 +495 @@
 
 void AW_window::set_horizontal_scrollbar_position(int position) {
+#if defined(DEBUG)
+    fprintf(stderr, "set_horizontal_scrollbar_position to %i\n", position);
+#endif
+    // @@@ test and constrain against limits
     slider_pos_horizontal = position;
     XtVaSetValues(p_w->scroll_bar_horizontal, XmNvalue, position, NULL);
@@ -1440 +1439 @@
 }
 
+void AW_window::get_scrollarea_size(AW_screen_area *square) {
+    _get_area_size(AW_MIDDLE_AREA, square);
+    square->r -= left_indent_of_horizontal_scrollbar;
+    square->b -= top_indent_of_vertical_scrollbar;
+}
+
 void AW_window::update_scrollbar_settings_from_awars(AW_orientation orientation) {
-    AW_screen_area screen;
-    _get_area_size(AW_MIDDLE_AREA, &screen);
+    AW_screen_area scrolled;
+    get_scrollarea_size(&scrolled);
 
     // @@@ DRY awar code
-    
+
     char buffer[200];
     if (orientation == AW_HORIZONTAL) {
         sprintf(buffer, "window/%s/horizontal_page_increment", window_defaults_name); 
-        XtVaSetValues(p_w->scroll_bar_horizontal, XmNpageIncrement, (int)((screen.r-left_indent_of_horizontal_scrollbar)*(get_root()->awar(buffer)->read_int()*0.01)), NULL);
+        XtVaSetValues(p_w->scroll_bar_horizontal, XmNpageIncrement, (int)(scrolled.r*(get_root()->awar(buffer)->read_int()*0.01)), NULL);
 
         sprintf(buffer, "window/%s/scroll_width_horizontal", window_defaults_name);
@@ -1459 +1464 @@
     else {
         sprintf(buffer, "window/%s/vertical_page_increment", window_defaults_name);
-        XtVaSetValues(p_w->scroll_bar_vertical, XmNpageIncrement, (int)((screen.b-top_indent_of_vertical_scrollbar-bottom_indent_of_vertical_scrollbar)*(get_root()->awar(buffer)->read_int()*0.01)), NULL);
+        XtVaSetValues(p_w->scroll_bar_vertical, XmNpageIncrement, (int)(scrolled.b*(get_root()->awar(buffer)->read_int()*0.01)), NULL);
 
         sprintf(buffer, "window/%s/scroll_width_vertical", window_defaults_name);
@@ -2483 +2488 @@
 }
 
-void AW_window::set_vertical_scrollbar_bottom_indent(int indent) {
-    XtVaSetValues(p_w->scroll_bar_vertical, XmNbottomOffset, (int)(3+indent), NULL);
-    bottom_indent_of_vertical_scrollbar = indent;
-}
-
 void AW_root::apply_sensitivity(AW_active mask) {
     aw_assert(legal_mask(mask));

branches/e4fix/WINDOW/aw_common.hxx

@@ -249 +249 @@
         // set clipping coordinates
         screen = screen_;
+        aw_assert(screen.t == 0 && screen.l == 0);
     }
 

branches/e4fix/WINDOW/aw_window.hxx

@@ -213 +213 @@
 
     bool expose_callback_added;
-    
+
+    int left_indent_of_horizontal_scrollbar;
+    int top_indent_of_vertical_scrollbar;
+
     void all_menus_created() const;
     void create_toggle(const char *var_name, aw_toggle_data *tdata);
@@ -286 +289 @@
 
     AW_color_idx alloc_named_data_color(int colnum, char *colorname);
-    void        _get_area_size(AW_area area, AW_screen_area *square);
-    int         label_widget(void *wgt, AW_label str, char *mnemonic=0, int width = 0, int alignment = 0);
+
+    void _get_area_size(AW_area area, AW_screen_area *square);
+    void get_scrollarea_size(AW_screen_area *square);
+    
+    int label_widget(void *wgt, AW_label str, char *mnemonic=0, int width = 0, int alignment = 0);
 
     // ------------------------------
@@ -297 +303 @@
     bool  window_is_shown;
 
-    int left_indent_of_horizontal_scrollbar;
-    int top_indent_of_vertical_scrollbar;
-    int bottom_indent_of_vertical_scrollbar;
     int slider_pos_vertical;
     int slider_pos_horizontal;
@@ -305 +308 @@
 
     AW_screen_area *picture;      // the result of tell scrolled
-                                // picture size
+    // picture size
 
     // --------------------------------
@@ -391 +394 @@
     void set_horizontal_scrollbar_left_indent(int indent);
     void set_vertical_scrollbar_top_indent(int indent);
-    void set_vertical_scrollbar_bottom_indent(int indent);
 
     void update_scrollbar_settings_from_awars(AW_orientation orientation);