Changeset 112 for widgets/button.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/button.r (modified) (2 diffs)

widgets/button.r

@@ -1 @@
-button: make rebface [
+button: make pill [
         tip:    {
                 USAGE:
@@ -12 +12 @@
                         'info specifies read-only
         }
-        size:   15x6
+        size:   15x5
         text:   ""
-        color:  colors/button
-        effect: [draw [pen 0.0.0.128 line-width 1 fill-pen linear 0x0 normal -4 0 90 1 1 none none none box 2x2 0x0 2 translate 2x2 pen 255.255.255.255 fill-pen none line-width 3 box 1x1 0x0 1]]
-        font:   make default-font [align: 'center]
-        feel:   make default-feel [
-                redraw: make function! [face act pos] [
-                        if act = 'show  [
-                                ;       handle color change
-                                all [
-                                        face/color
-                                        poke face/effect/draw 14 face/color
-                                        poke face/effect/draw 15 face/color * 0.9
-                                        poke face/effect/draw 16 face/color * 0.7
-                                        face/color: none
-                                ]
-                                ;       handle info
-                                all [
-                                        find face/options 'info
-                                        poke face/effect/draw 24 255.255.255.100
-                                ]
-                        ]
-                ]
+        color:  colors/theme-dark
+        font:   make default-font-heading [size: sizes/font - 2]
+        feel:   make feel [
                 over: make function! [face act pos] [
-                        poke face/effect/draw 24 either all [act not find face/options 'info] [colors/over] [255.255.255.255]
-                        show face
+                        set-color face either all [act not find face/options 'info] [colors/theme-light] [colors/theme-dark]
                 ]
                 engage: make function! [face act event /local f] [
                         unless find face/options 'info [
                                 do select [
-                                        down [
-                                                poke face/effect/draw 24 0.0.0.180
-                                                poke face/effect/draw 26 0.0.0.200
-                                                show face
-                                        ]
-                                        alt-down [
-                                                poke face/effect/draw 24 0.0.0.140
-                                                poke face/effect/draw 26 0.0.0.160
-                                                show face
-                                        ]
-                                        up [
-                                                poke face/effect/draw 24 255.255.255.255
-                                                poke face/effect/draw 26 none
-                                                show face
-                                                face/action/on-click face
-                                        ]
-                                        alt-up [
-                                                poke face/effect/draw 24 255.255.255.255
-                                                poke face/effect/draw 26 none
-                                                show face
-                                                face/action/on-alt-click face
-                                        ]
-                                        away [
-                                                poke face/effect/draw 24 255.255.255.255
-                                                poke face/effect/draw 26 none
-                                                show face
-                                        ]
+                                        down            [set-color face colors/theme-light]
+                                        alt-down        [set-color face colors/theme-light]
+                                        up                      [set-color face colors/theme-dark face/action/on-click face]
+                                        alt-up          [set-color face colors/theme-dark face/action/on-alt-click face]
+                                        away            [set-color face colors/theme-dark]
                                 ] act
                         ]
                 ]
         ]
-        action: make default-action [
-                on-resize: make function! [face] [
-                        poke face/effect/draw 10 face/size/y
-                        poke face/effect/draw 18 face/size - 2x2
-                        poke face/effect/draw 30 face/size - 6x6
-                ]
-        ]
         rebind: make function! [] [
-                color: colors/button
-                font/name: effects/font
-                font/size: sizes/font
+                color: colors/theme-dark
+                font/size: sizes/font - 2
         ]
         init:   make function! [] [
                 all [negative? size/x size/x: 10000 size/x: 8 + first size-text self]
+                all [find options 'info color = colors/theme-dark color: colors/outline-light]
                 action/on-resize self
         ]