discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=9d8e54d3938f7fa50d811dcf44dcb060ffa4eb61

commit 9d8e54d3938f7fa50d811dcf44dcb060ffa4eb61
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Jun 8 12:35:54 2015 -0400

    shelf: use constant rects for eventing
---
 data/themes/edc/shelf.edc | 50 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/data/themes/edc/shelf.edc b/data/themes/edc/shelf.edc
index a58343f..13e84c3 100644
--- a/data/themes/edc/shelf.edc
+++ b/data/themes/edc/shelf.edc
@@ -1,4 +1,4 @@
-group { name: "e/shelf/default/base";
+group { name: "e/shelf/default/base"; nomouse;
    alias: "e/shelf/alternate/base";
    data {
       /* this tells e the shelf is shaped, not rectangular */
@@ -19,6 +19,9 @@ group { name: "e/shelf/default/base";
    images.image: "holes_horiz.png" COMP;
    images.image: "shine.png" COMP;
    parts {
+      rect { "mouse"; mouse;
+         desc { color: 0 0 0 0; }
+      }
       part { name: "bg";
          description { state: "default" 0.0;
             image.normal: "vgrad_med.png";
@@ -33,7 +36,7 @@ group { name: "e/shelf/default/base";
             color_class: "shelf_base";
          }
       }
-      part { name: "bevel"; mouse_events: 0;
+      part { name: "bevel";
          description { state: "default" 0.0;
             image.normal: "bevel_out.png";
             image.border: 1 1 1 1;
@@ -41,7 +44,7 @@ group { name: "e/shelf/default/base";
             fill.smooth: 0;
          }
       }
-      part { name: "dots_start"; mouse_events: 0;
+      part { name: "dots_start";
          description { state: "default" 0.0;
             image.normal: "holes_vert.png";
             rel1.offset: 2 2;
@@ -57,7 +60,7 @@ group { name: "e/shelf/default/base";
             FIXED_SIZE(14, 4)
          }
       }
-      part { name: "dots_end"; mouse_events: 0;
+      part { name: "dots_end";
          description { state: "default" 0.0;
             image.normal: "holes_vert.png";
             rel1.relative: 1.0 0.0;
@@ -73,7 +76,7 @@ group { name: "e/shelf/default/base";
             FIXED_SIZE(14, 4)
          }
       }
-      part { name: "e.swallow.content"; type: SWALLOW;
+      part { name: "e.swallow.content"; type: SWALLOW; mouse;
          description { state: "default" 0.0;
             rel1.offset: 1 0;
             rel1.relative: 1.0 0.0;
@@ -91,7 +94,7 @@ group { name: "e/shelf/default/base";
             rel2.relative: 1.0 0.0;
          }
       }
-      part { name: "shine"; mouse_events: 0;
+      part { name: "shine";
          description { state: "default" 0.0;
             image.normal: "shine.png";
             rel1.offset: 0 -2;
@@ -100,6 +103,9 @@ group { name: "e/shelf/default/base";
             FIXED_SIZE(69, 5)
          }
       }
+      rect { "events"; repeat; mouse;
+         desc { color: 0 0 0 0; }
+      }
       programs  {
 #define ORIENT_SATE(_ORIENT, _STATE) \
          program { \
@@ -127,19 +133,22 @@ group { name: "e/shelf/default/base";
    }
 }
 
-group { name: "e/shelf/default/inset";
+group { name: "e/shelf/default/inset"; nomouse;
    alias: "e/shelf/alternate/inset";
    alias: "e/shelf/invisible/inset";
    alias: "e/shelf/translucent/inset";
    images.image: "horiz_bar_inset.png" COMP;
    images.image: "vert_bar_inset.png" COMP;
    parts {
+      rect { "mouse"; mouse;
+         desc { color: 0 0 0 0; }
+      }
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
             color: 0 0 0 0;
          }
       }
-      part { name: "clip"; type: RECT; mouse_events: 0;
+      part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
             rel1.offset: 3 1;
             rel2.offset: -4 -2;
@@ -151,7 +160,7 @@ group { name: "e/shelf/default/inset";
             color: 255 255 255 255;
          }
       }
-      part { name: "e.swallow.content"; type: SWALLOW;
+      part { name: "e.swallow.content"; type: SWALLOW; mouse;
          clip_to: "clip";
          description { state: "default" 0.0;
             rel1.offset: 4 1;
@@ -162,7 +171,7 @@ group { name: "e/shelf/default/inset";
             rel2.offset: -2 -5;
          }
       }
-      part { name: "inset"; mouse_events: 0;
+      part { name: "inset";
          description { state: "default" 0.0;
             rel1.offset: 2 0;
             rel2.offset: -3 -1;
@@ -180,6 +189,9 @@ group { name: "e/shelf/default/inset";
             fill.smooth: 0;
          }
       }
+      rect { "events"; repeat; mouse;
+         desc { color: 0 0 0 0; }
+      }
    }
    programs {
 #define ORIENT_SATE(_ORIENT, _STATE) \
@@ -206,7 +218,7 @@ group { name: "e/shelf/default/inset";
    }
 }
 
-group { name: "e/shelf/invisible/base";
+group { name: "e/shelf/invisible/base"; nomouse;
    inherit: "e/shelf/default/base";
    data {
       item: "shaped" "1";
@@ -230,7 +242,7 @@ group { name: "e/shelf/invisible/base";
             visible: 0;
          }
       }
-      part { name: "dots_start"; mouse_events: 1;
+      part { name: "dots_start";
          description { state: "default" 0.0;
             rel1.offset: 0 0;
             rel2.offset: -1 -1;
@@ -265,7 +277,7 @@ group { name: "e/shelf/invisible/base";
    }
 }
 
-group { name: "e/shelf/translucent/base";
+group { name: "e/shelf/translucent/base"; nomouse;
    inherit: "e/shelf/default/base";
    data {
       item: "shaped" "1";
@@ -292,27 +304,33 @@ group { name: "e/shelf/translucent/base";
    }
 }
 
-group { name: "e/shelf/default/plain";
+group { name: "e/shelf/default/plain"; nomouse;
    alias: "e/shelf/alternate/plain";
    alias: "e/shelf/invisible/plain";
    alias: "e/shelf/translucent/plain";
    parts {
+      rect { "mouse"; mouse;
+         desc { color: 0 0 0 0; }
+      }
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
             color: 0 0 0 0;
          }
       }
-      part { name: "clip"; type: RECT; mouse_events: 0;
+      part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
             color: 255 255 255 255;
          }
       }
-      part { name: "e.swallow.content"; type: SWALLOW;
+      part { name: "e.swallow.content"; type: SWALLOW; mouse;
          clip_to: "clip";
          description { state: "default" 0.0;
             rel1.offset: 1 1;
             rel2.offset: -2 -2;
          }
       }
+      rect { "events"; repeat; mouse;
+         desc { color: 0 0 0 0; }
+      }
    }
 }

-- 


Reply via email to