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

widgets/tab-panel.r

@@ -2 +2 @@
         tip:    {
                 USAGE:
-                        tab-panel data ["One" [field] "Two" [field field]]
+                        tab-panel data ["A" [field] "B" [field] "C" [field]]
                         tab-panel data ["1" [field] action [face/color: red] "2" [field]]
 
@@ -30 +30 @@
                         pane/(data: num)/show?: true
                 ][
-                        pane/(tabs + data)/color: colors/widget
+                        pane/(tabs + data)/color: colors/theme-dark
+                        pane/(tabs + data)/font/color: colors/page
                         pane/(data: num)/show?: true
-                        pane/(tabs + data)/color: colors/over
+                        pane/(tabs + data)/color: colors/page
+                        pane/(tabs + data)/font/color: colors/text
                 ]
                 pane/(data)/action pane/:data
@@ -40 +42 @@
                 pane/:num: layout/only block
                 pane/:num/offset: as-pair 0 either find options 'no-tabs [0] [sizes/line]
-                pane/:num/color: colors/widget
-                pane/:num/edge: default-edge
+                pane/:num/color: colors/page
+                pane/:num/edge: outline-edge
                 all [title pane/(tabs + num)/text: text]
                 if data <> num [pane/:num/show?: false]
@@ -60 +62 @@
                                 tab:                    layout/only spec
                                 tab/offset/y:   either find options 'no-tabs [0] [sizes/line]
-                                tab/color:              colors/widget
-                                tab/edge:               default-edge
+                                tab/color:              colors/page
+                                tab/edge:               outline-edge
                                 tab/show?:              false
                                 tab/span:               #LV
@@ -70 +72 @@
                                         insert tail pane make subface [
                                                 offset: tab-offset
-                                                size:   as-pair 1 sizes/line
+                                                size:   as-pair 1 sizes/line + 1
                                                 text:   title
-                                                effect: reduce ['round colors/edge effects/radius sizes/edge]
+                                                effect: reduce ['round colors/outline-light effects/radius sizes/edge]
                                                 data:   tabs
-                                                color:  colors/widget
-                                                font:   make default-font [align: 'center]
+                                                color:  colors/theme-dark
+                                                font:   make default-font [color: colors/page align: 'center]
                                                 para:   default-para
                                                 feel:   make default-feel [
                                                         over: make function! [face act pos] [
-                                                                either act [
-                                                                        face/color: colors/over
-                                                                        show face
-                                                                ][
-                                                                        all [
-                                                                                face/data <> face/parent-face/data
-                                                                                face/color: colors/widget
-                                                                                show face
-                                                                        ]
+                                                                face/color: either act [colors/theme-light] [
+                                                                        either face/data = face/parent-face/data [colors/page] [colors/theme-dark]
                                                                 ]
+                                                                show face
                                                         ]
                                                         engage: make function! [face act event /local p] [
@@ -97 +93 @@
                                         tab: last pane
                                         tab/size/x: sizes/line + first size-text tab    ; set tab title width
-                                        tab-offset/x: tab-offset/x + tab/size/x                 ; set offset for next tab title
+                                        tab-offset/x: tab-offset/x + tab/size/x + 2             ; set offset for next tab title
                                 ]
                                 trigger: none
@@ -119 +115 @@
                 ;       show selected tab
                 pane/(data: any [select options 'tab 1])/show?: true
-                unless find options 'no-tabs [pane/(tabs + data)/color: colors/over]
+                unless find options 'no-tabs [select-tab data] ;pane/(tabs + data)/color: colors/page]
                 all [find options 'action pane/(data)/action pane/:data]
         ]