Changeset 112 for widgets/slider.r

Timestamp:

12/31/07 22:18:08 (11 months ago)

Author:

ashley

Message:

Added pill.r
Scroller fixes
Major color / theme management changes (in progress)

Files:

• widgets/slider.r (modified) (11 diffs)

widgets/slider.r

@@ -12 +12 @@
                         'arrows adds an arrow to each end of the slider creating a scroller
                         'together forces the arrows to appear together
-                        [ratio n] where n has the same value as face/data above but indicates the initial dragger size
+                        [ratio n] where n indicates the initial dragger size
         }
         size:   5x50
         data:   0
-        color:  colors/window
+        color:  colors/outline-light
         effect: [
                 draw [
-                        pen colors/edge fill-pen colors/btn-up box 0x0 10x10 ; dragger
+                        pen colors/outline-dark fill-pen colors/theme-light box 0x0 10x10 ; dragger
                         ; arrow buttons
-                        fill-pen colors/btn-up box 0x0 0x0
-                        fill-pen colors/btn-up box 0x0 0x0
-                        fill-pen black triangle 0x0 0x0 0x0
-                        fill-pen black triangle 0x0 0x0 0x0
+                        fill-pen colors/theme-light box 0x0 0x0
+                        fill-pen colors/theme-light box 0x0 0x0
+                        pen colors/page
+                        fill-pen colors/page triangle 0x0 0x0 0x0
+                        fill-pen colors/page triangle 0x0 0x0 0x0
                 ]
         ]
@@ -33 +34 @@
         state:  none
         flags:  none
+
+        set-data: make function! [new [integer! decimal! pair!] /local old][
+                old: data
+                data: min 1 max 0 either pair? new [
+                        data + either negative? new/y [negate step] [step]
+                ] [new]
+                all [data <> old show self] ; (face/action is done in redraw)
+        ]
 
         feel:   make default-feel [
@@ -69 +78 @@
                                                 arrow-blk/10: arrow-blk/9 + arrow-size
 
-                                                arrow-blk/14: arrow-blk/4 + (width * 0.1 * either axis = 'y [5x2][2x5])
-                                                arrow-blk/15: arrow-blk/4 + (width * 0.1 * either axis = 'y [2x7][7x8])
-                                                arrow-blk/16: arrow-blk/4 + (width * 0.1 * either axis = 'y [8x7][7x2])
-
-                                                arrow-blk/20: arrow-blk/9 + (width * 0.1 * either axis = 'y [5x8][8x5])
-                                                arrow-blk/21: arrow-blk/9 + (width * 0.1 * either axis = 'y [8x3][3x2])
-                                                arrow-blk/22: arrow-blk/9 + (width * 0.1 * either axis = 'y [2x3][3x8])
+                                                arrow-blk/16: arrow-blk/4 + (width * 0.1 * either axis = 'y [5x2][2x5])
+                                                arrow-blk/17: arrow-blk/4 + (width * 0.1 * either axis = 'y [2x7][7x8])
+                                                arrow-blk/18: arrow-blk/4 + (width * 0.1 * either axis = 'y [8x7][7x2])
+
+                                                arrow-blk/22: arrow-blk/9 + (width * 0.1 * either axis = 'y [5x8][8x5])
+                                                arrow-blk/23: arrow-blk/9 + (width * 0.1 * either axis = 'y [8x3][3x2])
+                                                arrow-blk/24: arrow-blk/9 + (width * 0.1 * either axis = 'y [2x3][3x8])
                                         ][
-                                                repeat pos [4 5 9 10 14 15 16 20 21 22][arrow-blk/:pos: 0x0]
+                                                repeat pos [4 5 9 10 16 17 18 22 23 24][arrow-blk/:pos: 0x0]
                                         ]
 
@@ -96 +105 @@
                                         ]
                                 ]
-                        ]
-                ]
-                set-data: make function! [face [object!] data [number!] /local old][
-                        old: face/data
-                        face/data: min 1 max 0 data
-                        if face/data <> old [
-                                show face ; (face/action is done in redraw)
                         ]
                 ]
@@ -136 +138 @@
                                         freedom > 0 
                                 ][
-                                        set-data face (offset - face/hold / (dragdom * freedom))
+                                        face/set-data (offset - face/hold / (dragdom * freedom))
                                 ]
                                 exit
@@ -149 +151 @@
                                                 ; clicked on dragger
                                                 face/hold: offset - (dragdom * (freedom * face/data))
-                                                face/effect/draw/4: colors/btn-down show face
+                                                face/effect/draw/4: colors/state-light show face
                                         ]
                                 ][
@@ -158 +160 @@
                                                         if act = 'down [
                                                                 face/hold: 'top-arrow
-                                                                face/effect/draw/9: colors/btn-down show face
+                                                                face/effect/draw/9: colors/state-light show face
                                                         ]
                                                         if face/hold = 'top-arrow [
-                                                                set-data face (face/data - face/step)
+                                                                face/set-data (face/data - face/step)
                                                         ]
                                                 ]
@@ -169 +171 @@
                                                         if act = 'down [
                                                                 face/hold: 'top-arrow
-                                                                face/effect/draw/9: colors/btn-down show face
+                                                                face/effect/draw/9: colors/state-light show face
                                                         ]
                                                         if face/hold = 'top-arrow [
-                                                                set-data face (face/data - face/step)
+                                                                face/set-data (face/data - face/step)
                                                         ]
                                                 ]
@@ -180 +182 @@
                                                         if act = 'down [
                                                                 face/hold: 'bottom-arrow
-                                                                face/effect/draw/14: colors/btn-down show face
+                                                                face/effect/draw/14: colors/state-light show face
                                                         ]
                                                         if face/hold = 'bottom-arrow [
-                                                                set-data face (face/data + face/step)
+                                                                face/set-data (face/data + face/step)
                                                         ]
                                                 ]
@@ -192 +194 @@
                                                         if face/hold = 'page [
                                                                 page: any [all [freedom = 0 0] face/ratio / freedom]
-                                                                set-data face (face/data + either more? [page][- page])
+                                                                face/set-data (face/data + either more? [page] [negate page])
                                                         ]
                                                 ]
@@ -200 +202 @@
                         if act = 'up [
                                 face/rate: none face/hold: none 
-                                face/effect/draw/4: face/effect/draw/9: face/effect/draw/14: colors/btn-up show face
+                                face/effect/draw/4: face/effect/draw/9: face/effect/draw/14: colors/theme-light show face
                         ]
                 ]
         ]
-;       action: make default-action [
-;               on-click: make function! [face] [system/view/focal-face: face]
-;               on-scroll: make function! [face scroll /page] [
-;                       either page [
-;                               all [
-;                                       face/size/x > face/size/y
-;                                       set-data face face/data + either negative? scroll/y [negate face/step] [face/step]
-;                               ]
-;                       ][
-;                               all [
-;                                       face/size/y > face/size/x
-;                                       set-data face face/data + either negative? scroll/y [negate face/step] [face/step]
-;                               ]
-;                       ]
-;               ]
-;       ]
-        rebind: make function! [] [color: colors/window]
+        rebind: make function! [] [color: colors/outline-light]
         init:   make function! [] [
                 all [number? data data: min 1 max 0 data]