From: <enl...@li...> - 2005-10-31 21:37:16
|
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Modified Files: scrollbar.edc tree.edc Log Message: * Clip the watermark in the tree theme * Rewrite the scrollbar to take profit of the drag features of edje * Add the ability to clip a widget against an evas object * Add a scrolled view!!! :) * Add a viewport to make every widgets scrollable =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/scrollbar.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- scrollbar.edc 23 Oct 2005 08:05:34 -0000 1.2 +++ scrollbar.edc 31 Oct 2005 21:36:40 -0000 1.3 @@ -28,14 +28,15 @@ visible: 0; rel1 { relative: 0.0 0.5; - offset: 18 -6; + offset: 16 10; } rel2 { relative: 1.0 0.5; - offset: -35 7; + offset: -33 10; } } } + SCROLLBAR_DRAG("drag", 20, 20, 1, 0, "scrollbar_hdrag_thumb.png") SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, -1, -8, "scrollbar_arrow_left.png") SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -34, -8, "scrollbar_arrow_left.png") SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -18, -8, "scrollbar_arrow_right.png") @@ -46,13 +47,6 @@ SCROLLBAR_BUTTON_PROG("right_right_arrow", "right") } } -group { - name: "hscrollbar_drag"; - min: 14 0; - parts { - SCROLLBAR_DRAG("drag", 0.0, 0.0, -5, -2, 1.0, 1.0, 4, 1, "scrollbar_hdrag_thumb.png") - } -} group { name: "vscrollbar"; @@ -84,14 +78,15 @@ visible: 0; rel1 { relative: 0.5 0.0; - offset: -6 18; + offset: 10 16; } rel2 { relative: 0.5 1.0; - offset: 7 -35; + offset: 10 -33; } } } + SCROLLBAR_DRAG("drag", 20, 20, 0, 1, "scrollbar_vdrag_thumb.png") SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -8, -1, "scrollbar_arrow_up.png") SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -8, -34, "scrollbar_arrow_down.png") SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -8, -18, "scrollbar_arrow_down.png") @@ -102,10 +97,3 @@ SCROLLBAR_BUTTON_PROG("down_down_arrow", "down") } } -group { - name: "vscrollbar_drag"; - min: 0 14; - parts { - SCROLLBAR_DRAG("drag", 0.0, 0.0, -2, -5, 1.0, 1.0, 1, 4, "scrollbar_vdrag_thumb.png") - } -} =================================================================== RCS file: /cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/tree.edc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- tree.edc 28 Oct 2005 14:06:25 -0000 1.4 +++ tree.edc 31 Oct 2005 21:36:40 -0000 1.5 @@ -30,12 +30,27 @@ } } part { + name: "watermark_clip"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + relative: 0.0 0.0; + offset: 0 0; + } + rel2 { + relative: 1.0 1.0; + offset: -1 -1; + } + } + } + part { name: "watermark"; mouse_events: 0; + clip_to: "watermark_clip"; description { state: "default" 0.0; - visible: 1; - color: 255 255 255 255; rel1 { relative: 1.0 1.0; offset: -200 -138; |