Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src


Modified Files:
        ewl_scrollbar.c ewl_scrollpane.c ewl_seeker.c 


Log Message:
Fixed the inversion of vertical scrolling, also closed up a couple sizing
issues with the scrollbar handles.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollbar.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ewl_scrollbar.c     24 Jun 2003 06:04:40 -0000      1.20
+++ ewl_scrollbar.c     24 Jun 2003 20:19:31 -0000      1.21
@@ -79,7 +79,6 @@
         * Setup the seeker portion
         */
        s->seeker = ewl_seeker_new(orientation);
-       ewl_seeker_set_range(EWL_SEEKER(s->seeker), 1.0);
        ewl_widget_show(s->seeker);
 
        /*
@@ -113,7 +112,7 @@
 
        /*
         * Define the maximum value that the seeker can reach, and the
-        * increments it takes to get there.
+        * default increments it takes to get there.
         */
        ewl_seeker_set_range(EWL_SEEKER(s->seeker), 1.0);
        ewl_seeker_set_step(EWL_SEEKER(s->seeker), 0.05);
@@ -217,7 +216,7 @@
                /*
                 * Set the default value to the beginning of the seeker.
                 */
-               ewl_seeker_set_value(EWL_SEEKER(s->seeker), 1.0);
+               ewl_seeker_set_value(EWL_SEEKER(s->seeker), 0);
                ewl_widget_set_appearance(w, "vscrollbar");
                ewl_object_set_fill_policy(EWL_OBJECT(s),
                                EWL_FILL_POLICY_VFILL);
@@ -241,8 +240,10 @@
 
        v = ewl_seeker_get_value(EWL_SEEKER(s->seeker));
 
+       /*
        if (EWL_BOX(s)->orientation == EWL_ORIENTATION_VERTICAL)
                v = 1.0 - v;
+               */
 
        DRETURN_FLOAT(v, DLEVEL_UNSTABLE);
 }
@@ -258,8 +259,10 @@
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("s", s);
 
+       /*
        if (EWL_BOX(s)->orientation == EWL_ORIENTATION_VERTICAL)
                v = 1.0 - v;
+               */
 
        ewl_seeker_set_value(EWL_SEEKER(s->seeker), v);
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_scrollpane.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_scrollpane.c    24 Jun 2003 06:04:40 -0000      1.18
+++ ewl_scrollpane.c    24 Jun 2003 20:19:31 -0000      1.19
@@ -221,10 +221,10 @@
         * A rare case where we need to know the preferred size over the
         * minimum size.
         */
-       b_width = ewl_object_get_preferred_w(EWL_OBJECT(s->box)) - content_w;
+       b_width = ewl_object_get_preferred_w(EWL_OBJECT(s->box));
        if (b_width < 0)
                b_width = 0;
-       b_height = ewl_object_get_preferred_h(EWL_OBJECT(s->box)) - content_h;
+       b_height = ewl_object_get_preferred_h(EWL_OBJECT(s->box));
        if (b_height < 0)
                b_height = 0;
 
@@ -237,9 +237,9 @@
                        (double)content_h / (double)b_height);
 
        b_width = (int)(ewl_scrollbar_get_value(EWL_SCROLLBAR(s->hscrollbar)) *
-                                             (double)(b_width));
+                                             (double)(b_width - content_w));
        b_height= (int)(ewl_scrollbar_get_value(EWL_SCROLLBAR(s->vscrollbar)) *
-                                             (double)(b_height));
+                                             (double)(b_height - content_h));
 
        /*
         * Now move the box into position. For the scrollpane to work we move
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_seeker.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_seeker.c        23 Jun 2003 05:59:19 -0000      1.38
+++ ewl_seeker.c        24 Jun 2003 20:19:31 -0000      1.39
@@ -233,6 +233,9 @@
        DENTER_FUNCTION(DLEVEL_STABLE);
        DCHECK_PARAM_PTR("s", s);
 
+       if (step > s->range)
+               step = s->range;
+
        s->step = step;
 
        DLEAVE_FUNCTION(DLEVEL_STABLE);




-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to