[detour commit] r716 - Revert border buttons' shadow.

0 views
Skip to first unread message

codesite...@google.com

unread,
Mar 13, 2009, 4:01:42 AM3/13/09
to detour-the...@googlegroups.com
Author: alberto.castro.leiva
Date: Fri Mar 13 00:10:33 2009
New Revision: 716

Modified:
branches/e17/bits/border.edc
branches/e17/bits/fileman.edc
branches/e17/bits/menu.edc
branches/e17/macros/border.edc
branches/e17/macros/border_programs.edc

Log:
Revert border buttons' shadow.
Fileman: desktop icons overlay acting weird


Modified: branches/e17/bits/border.edc
==============================================================================
--- branches/e17/bits/border.edc (original)
+++ branches/e17/bits/border.edc Fri Mar 13 00:10:33 2009
@@ -117,12 +117,6 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
- BUTTON_SHADOW("button-close_shadow", "close-clip", 18
17, "close-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-max_shadow", "max-clip", 18
17, "max-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-min_shadow", "min-clip", 18
17, "min-clip", "images/button_im4.png")
- BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
@@ -230,12 +224,6 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
- BUTTON_SHADOW("button-close_shadow", "close-clip", 18
17, "close-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-max_shadow", "max-clip", 18
17, "max-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-min_shadow", "min-clip", 18
17, "min-clip", "images/button_im4.png")
- BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
@@ -365,8 +353,6 @@
CLIPS("close-clip", 20 18, 20 18, "top-right", 0.0 0.0, 0 0, 0.0 1.0,
-23 0)
HOLDER("_close", 20 18, "close-clip", "images/window-border_bt0.png")
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
- BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
- BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
RESIZE_TOP("resize_t", 1 2, 9999 2, "top-left", 0.0 0.0, 0
0, "top-right", 0.0 0.0, -1 0, 255 0 0 0)
E_SWALLOW_ICON("e.swallow.icon", "e.event.icon")
@@ -466,8 +452,6 @@
CLIPS("close-clip", 20 18, 20 18, "top-right", 0.0 0.0, 0 0, 0.0 1.0,
-23 0)
HOLDER("_close", 20 18, "close-clip", "images/window-border_bt0.png")
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
- BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
- BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
RESIZE_TOP("resize_t", 1 2, 9999 2, "top-left", 0.0 0.0, 0
0, "top-right", 0.0 0.0, -1 0, 255 0 0 0)
E_SWALLOW_ICON("e.swallow.icon", "e.event.icon")
@@ -482,8 +466,7 @@
source: "button-close";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "button-close_shadow";
- target: "button-close_shadow_overlay";
+ target: "button-close";
}

program {
@@ -492,8 +475,7 @@
source: "button-close";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "button-close_shadow";
- target: "button-close_shadow_overlay";
+ target: "button-close";
}
}
}
@@ -588,10 +570,6 @@
HOLDER("_close", 20 18, "close-clip", "images/window-border_bt0.png")
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
- BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-min_shadow", "min-clip", 17
17, "min-clip", "images/button_im4.png")
- BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
RESIZE_TOP("resize_t", 1 2, 9999 2, "top-left", 0.0 0.0, 0
0, "top-right", 0.0 0.0, -1 0, 255 0 0 0)
@@ -607,8 +585,7 @@
source: "button-close";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "button-close_shadow";
- target: "button-close_shadow_overlay";
+ target: "button-close";
}

program {
@@ -617,8 +594,7 @@
source: "button-close";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "button-close_shadow";
- target: "button-close_shadow_overlay";
+ target: "button-close";
}

program {
@@ -627,8 +603,7 @@
source: "button-min";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "button-min_shadow";
- target: "button-min_shadow_overlay";
+ target: "button-min";
}

program {
@@ -637,8 +612,7 @@
source: "button-min";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "button-min_shadow";
- target: "button-min_shadow_overlay";
+ target: "button-min";
}
}
}
@@ -877,12 +851,6 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
- BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-max_shadow", "max-clip", 17
17, "max-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-min_shadow", "min-clip", 17
17, "min-clip", "images/button_im4.png")
- BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
@@ -919,8 +887,7 @@
source: "button-close";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "button-close_shadow";
- target: "button-close_shadow_overlay";
+ target: "button-close";
}

program {
@@ -929,8 +896,7 @@
source: "button-close";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "button-close_shadow";
- target: "button-close_shadow_overlay";
+ target: "button-close";
}

program {
@@ -939,8 +905,7 @@
source: "button-max";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "button-max_shadow";
- target: "button-max_shadow_overlay";
+ target: "button-max";
}

program {
@@ -949,8 +914,7 @@
source: "button-max";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "button-max_shadow";
- target: "button-max_shadow_overlay";
+ target: "button-max";
}

program {
@@ -959,8 +923,7 @@
source: "button-min";
action: STATE_SET "clicked" 0.0;
transition: DECELERATE 0.15;
- target: "button-min_shadow";
- target: "button-min_shadow_overlay";
+ target: "button-min";
}

program {
@@ -969,8 +932,7 @@
source: "button-min";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
- target: "button-min_shadow";
- target: "button-min_shadow_overlay";
+ target: "button-min";
}
}
}
@@ -1115,12 +1077,6 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
- BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-max_shadow", "max-clip", 17
17, "max-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-min_shadow", "min-clip", 17
17, "min-clip", "images/button_im4.png")
- BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")
@@ -1228,12 +1184,6 @@
BUTTONS("button-close", "close-clip", 17
17, "close-clip", "images/window-border_bt4.png")
BUTTONS("button-max", "max-clip", 17
17, "max-clip", "images/window-border_bt3.png")
BUTTONS("button-min", "min-clip", 17
17, "min-clip", "images/window-border_bt2.png")
- BUTTON_SHADOW("button-close_shadow", "close-clip", 17
17, "close-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-max_shadow", "max-clip", 17
17, "max-clip", "images/button_im4.png")
- BUTTON_SHADOW("button-min_shadow", "min-clip", 17
17, "min-clip", "images/button_im4.png")
- BUTTON_SHADOW_OVERLAY("button-close_shadow_overlay", "close-clip", 20
18, "close-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-max_shadow_overlay", "max-clip", 20
18, "max-clip", "images/button_im5.png")
- BUTTON_SHADOW_OVERLAY("button-min_shadow_overlay", "min-clip", 20
18, "min-clip", "images/button_im5.png")
PART_EVENT_MAP("e.event.close", 1, "button-close")
PART_EVENT_MAP("e.event.maximize", 1, "button-max")
PART_EVENT_MAP("e.event.minimize", 1, "button-min")

Modified: branches/e17/bits/fileman.edc
==============================================================================
--- branches/e17/bits/fileman.edc (original)
+++ branches/e17/bits/fileman.edc Fri Mar 13 00:10:33 2009
@@ -3506,13 +3506,13 @@

rel1 {
relative: 0.0 0.0;
- offset: 4 4;
+ offset: 8 8;
}

rel2 {
to_y: "e.text.label";
relative: 1.0 0.0;
- offset: -5 2;
+ offset: -9 -2;
}
}
}
@@ -3593,13 +3593,13 @@
rel1 {
to: "icon";
relative: 0.0 0.0;
- offset: -8 -8;
+ offset: -9 -9;
}

rel2 {
to: "icon";
relative: 1.0 1.0;
- offset: 7 4;
+ offset: 8 8;
}

image {

Modified: branches/e17/bits/menu.edc
==============================================================================
--- branches/e17/bits/menu.edc (original)
+++ branches/e17/bits/menu.edc Fri Mar 13 00:10:33 2009
@@ -740,9 +740,9 @@

description {
state: "default" 0.0;
- aspect: 1.0 1.0;
+ //aspect: 1.0 1.0;
+

-/*
rel1 {
relative: 0.0 0.0;
offset: 2 2;
@@ -752,8 +752,8 @@
relative: 1.0 1.0;
offset: -3 -3;
}
-*/

+/*
rel1 {
relative: 0.0 0.0;
offset: 1 1;
@@ -763,6 +763,7 @@
relative: 1.0 1.0;
offset: -2 -2;
}
+*/
}
}
}

Modified: branches/e17/macros/border.edc
==============================================================================
--- branches/e17/macros/border.edc (original)
+++ branches/e17/macros/border.edc Fri Mar 13 00:10:33 2009
@@ -288,74 +288,6 @@
} \
}

-#define BUTTON_SHADOW(NAME, CLIP, SIZE, TO, IMG) \
-part { \
- name: NAME; \
- type: IMAGE; \
- mouse_events: 0; \
- clip_to: CLIP; \
- \
- description { \
- state: "default" 0.0; \
- min: SIZE; \
- max: SIZE; \
- color: 255 255 255 0; \
- \
- rel1 { \
- to: TO; \
- } \
- \
- rel2 { \
- to: TO; \
- } \
- \
- image { \
- normal: IMG; \
- border: 6 6 7 0; \
- } \
- } \
- \
- description { \
- state: "clicked" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 255; \
- } \
-}
-
-#define BUTTON_SHADOW_OVERLAY(NAME, CLIP, SIZE, TO, IMG) \
-part { \
- name: NAME; \
- type: IMAGE; \
- mouse_events: 0; \
- clip_to: CLIP; \
- \
- description { \
- state: "default" 0.0; \
- min: SIZE; \
- max: SIZE; \
- color: 255 255 255 0; \
- \
- rel1 { \
- to: TO; \
- } \
- \
- rel2 { \
- to: TO; \
- } \
- \
- image { \
- normal: IMG; \
- border: 6 6 6 13; \
- } \
- } \
- \
- description { \
- state: "clicked" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 192; \
- } \
-}
-
#define RESIZE_TOP(NAME, MIN, MAX, TO1, REL1, OFF1, TO2, REL2, OFF2,
COLOR) \
part { \
name: NAME; \

Modified: branches/e17/macros/border_programs.edc
==============================================================================
--- branches/e17/macros/border_programs.edc (original)
+++ branches/e17/macros/border_programs.edc Fri Mar 13 00:10:33 2009
@@ -21,48 +21,42 @@
signal: "mouse,down,1"; \
source: "button-close"; \
action: STATE_SET "clicked" 0.0; \
- target: "button-close_shadow"; \
- target: "button-close_shadow_overlay"; \
+ target: "button-close"; \
} \
program { \
name: "close_unclick"; \
signal: "mouse,up,1"; \
source: "button-close"; \
action: STATE_SET "default" 0.0; \
- target: "button-close_shadow"; \
- target: "button-close_shadow_overlay"; \
+ target: "button-close"; \
} \
program { \
name: "max_click"; \
signal: "mouse,down,1"; \
source: "button-max"; \
action: STATE_SET "clicked" 0.0; \
- target: "button-max_shadow"; \
- target: "button-max_shadow_overlay"; \
+ target: "button-max"; \
} \
program { \
name: "max_unclick"; \
signal: "mouse,up,1"; \
source: "button-max"; \
action: STATE_SET "default" 0.0; \
- target: "button-max_shadow"; \
- target: "button-max_shadow_overlay"; \
+ target: "button-max"; \
} \
program { \
name: "min_click"; \
signal: "mouse,down,1"; \
source: "button-min"; \
action: STATE_SET "clicked" 0.0; \
- target: "button-min_shadow"; \
- target: "button-min_shadow_overlay"; \
+ target: "button-min"; \
} \
program { \
name: "min_unclick"; \
signal: "mouse,up,1"; \
source: "button-min"; \
action: STATE_SET "default" 0.0; \
- target: "button-min_shadow"; \
- target: "button-min_shadow_overlay"; \
+ target: "button-min"; \
} \
program { \
name: "urgent"; \
@@ -97,16 +91,14 @@
signal: "mouse,down,1"; \
source: "button-close"; \
action: STATE_SET "clicked" 0.0; \
- target: "button-close_shadow"; \
- target: "button-close_shadow_overlay"; \
+ target: "button-close"; \
} \
program { \
name: "close_unclick"; \
signal: "mouse,up,1"; \
source: "button-close"; \
action: STATE_SET "default" 0.0; \
- target: "button-close_shadow"; \
- target: "button-close_shadow_overlay"; \
+ target: "button-close"; \
} \
program { \
name: "urgent"; \

Reply all
Reply to author
Forward
0 new messages