e-modules/comp-scale: fix min/max regionsize in scale-layout. caused really bad layouting

- added scale-by-window-class action



SVN revision: 57892

e-module-scale.edc

@@ -2,6 +2,7 @@ images
 {
 	image: "module_icon.png" COMP;
    	image: "sh.png" COMP;
+	image: "label.png" COMP;
 }
 
 collections
@@ -120,10 +121,6 @@ collections
 						offset:    15   17;
 					}
 				}
-				description { state: "hidden" 0.0;
-					inherit: "default" 0.0;
-					visible: 0;
-				}
 			}
 
 			part {
@@ -135,6 +132,81 @@ collections
 					color: 255 255 255 255;
 				}
 			}
+
+			part {
+				name: "text.clipper";
+				type: RECT;
+ 				description {
+					state: "default" 0.0;
+					rel1 {
+						to: "e.swallow.win";
+						offset: 10 0;
+					}
+					rel2 {
+						to: "e.swallow.win";
+						offset: -10 -1;
+					}
+					color: 255 255 255 0;
+				}
+ 				description {
+					state: "show" 0.0;
+					inherit: "default" 0.0;
+					color: 255 255 255 255;
+				}
+			}
+			
+			part {
+				name: "text_bg";
+				mouse_events: 0;
+				clip_to: "text.clipper";
+				description {
+					state: "default" 0.0;
+					min: 60 22;
+					max: 9999 22;
+					color: 255 255 255 192;
+					rel1 {
+						to: "e.text.label";
+						relative: 0.0 0.0;
+						offset: -10 0;
+					}
+					rel2 {
+						to: "e.text.label";
+						relative: 1.0 1.0;
+						offset: 10 -1;
+					}
+					image {
+						normal: "label.png";
+						border: 5 5 5 5;
+					}				
+				}
+			}
+			part {
+				name: "e.text.label";
+				type: TEXT;
+				mouse_events: 0;
+				clip_to: "text.clipper";
+				description {
+					state: "default" 0.0;
+					rel1 {
+						to: "e.swallow.win";
+						offset: 25 0;
+					}
+					rel2 {
+						to: "e.swallow.win";
+						offset: -25 -1;
+					}
+					text {
+						font: "Sans:style=Bold";
+						size: 7;
+						align: 0.5 0.5;
+						elipsis: 1.0;
+						/* min: 0 1; */
+						max: 1 0;
+						text: "";
+						text_class: "border_title_active";
+					}
+				}
+			}
 		}
 		programs {
 			program {
@@ -142,7 +214,7 @@ collections
 				signal: "mouse,in";
 				source: "e";
 				action: STATE_SET "default" 0.0;
-				transition: LINEAR 0.2;
+				transition: SINUSOIDAL 0.4;
 				target: "clipper";
 			}
 			program {
@@ -150,9 +222,41 @@ collections
 				signal: "mouse,out";
 				source: "e";
 				action: STATE_SET "faded" 0.0;
-				transition: LINEAR 0.4;
+				transition: SINUSOIDAL 0.4;
 				target: "clipper";
 			}
+			/* program {
+			 * 	name: "mouse_in2";
+			 * 	signal: "mouse,in";
+			 * 	source: "e";
+			 * 	action: STATE_SET "show" 0.0;
+			 * 	transition: SINUSOIDAL 0.5;
+			 * 	target: "text.clipper";
+			 * } */
+			/* program {
+			 * 	name: "mouse_out2";
+			 * 	signal: "mouse,out";
+			 * 	source: "e";
+			 * 	action: STATE_SET "default" 0.0;
+			 * 	transition: SINUSOIDAL 0.5;
+			 * 	target: "text.clipper";
+			 * } */
+			program {
+				name: "hide";
+				signal: "hide";
+				source: "e";
+				action: STATE_SET "default" 0.0;
+				transition: SINUSOIDAL 0.2;
+				target: "clipper";
+			}
+			/* program {
+			 * 	name: "show";
+			 * 	signal: "show";
+			 * 	source: "e";
+			 * 	action: STATE_SET "default" 0.0;
+			 * 	transition: SINUSOIDAL 0.2;
+			 * 	target: "text.clipper";
+			 * } */
 		}
 	}
 	group {

src/e_mod_main.c

@@ -244,6 +244,8 @@ e_modapi_init(E_Module *m)
 				 "scale-windows", "go_scale", NULL, 0);
 	e_action_predef_name_set(D_("Scale Windows"), D_("Scale Windows (All Desktops)"),
 				 "scale-windows", "go_scale_all", NULL, 0);
+	e_action_predef_name_set(D_("Scale Windows"), D_("Scale Windows (By Class)"),
+				 "scale-windows", NULL, "go_scale_class:E", 1);
 	e_action_predef_name_set(D_("Scale Windows"), D_("Select Next"),
 				 "scale-windows", "go_scale_next", NULL, 0);
 	e_action_predef_name_set(D_("Scale Windows"), D_("Select Previous"),
@@ -308,6 +310,7 @@ e_modapi_shutdown(E_Module *m)
      {
 	e_action_predef_name_del(D_("Scale Windows"), D_("Scale Windows"));
 	e_action_predef_name_del(D_("Scale Windows"), D_("Scale Windows (All Desktops)"));
+	e_action_predef_name_del(D_("Scale Windows"), D_("Scale Windows (By Class)"));
 	e_action_predef_name_del(D_("Scale Windows"), D_("Select Next"));
 	e_action_predef_name_del(D_("Scale Windows"), D_("Select Previous"));
 

src/e_mod_pager.c

@@ -233,7 +233,7 @@ _pager_out()
    EINA_LIST_FOREACH(items, l, it)
      {
 	edje_object_signal_emit(it->o, "hide", "e");
-	edje_object_signal_emit(it->o, "mouse,in", "e");
+	/* edje_object_signal_emit(it->o, "mouse,in", "e"); */
 	it->bd_x = it->bd->x + (it->desk->x - current_desk->x) * zone->w;
 	it->bd_y = it->bd->y + (it->desk->y - current_desk->y) * zone->h;
      }
@@ -504,6 +504,9 @@ _pager_win_cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void *event_info)
    if (!mouse_activated)
      return;
 
+   if (!scale_state)
+     return;
+   
    mouse_activated = 0;
 
    if (selected_item && (it != selected_item))
@@ -699,6 +702,7 @@ _pager_win_new(Evas *e, E_Manager *man, E_Manager_Comp_Source *src)
 
    items = eina_list_append(items, it);
 
+   edje_object_part_text_set(it->o, "e.text.label", e_border_name_get(it->bd));
    edje_object_signal_emit(it->o, "show", "e");
 
    if (it->bd != e_border_focused_get())