release - 1.26.1

@fix

data/elementary/themes/colorclasses.edc

@@ -496,6 +496,7 @@ color_tree {
    }
    ":dim-lighter" {
       "/dim/normal/hover";
+      "/dim/normal/inwin";
       "/bg/normal/multibuttonentry/button";
       "/bg/normal/calendar/day/today";
       "/fg/normal/text-subtle";

data/elementary/themes/edc/border.edc

@@ -590,9 +590,8 @@ group { name: "e/widgets/border/default/border";
          repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
-            rel1.to: "e.swallow.volume";
+            rel.to: "e.event.icon";
             rel1.relative: 1.0 0.0;
-            rel2.to: "e.swallow.volume";
             rel2.relative: 1.0 1.0;
             rel2.offset: 0 -1;
             align: 0.0 0.5;
@@ -607,14 +606,20 @@ group { name: "e/widgets/border/default/border";
          source: "e/widgets/border/volume";
          description { state: "default" 0.0;
             fixed: 1 0;
-            rel1.to: "e.event.icon";
+            rel1.to_x: "e.event.icon";
+            rel2.to_x: "e.event.icon";
+            rel1.to_y: "top";
+            rel2.to_y: "top";
             rel1.relative: 1.0 0.0;
-            rel2.to: "e.event.icon";
             rel2.relative: 1.0 1.0;
             rel2.offset: 0 -1;
             align: 0.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
          }
+         description { state: "visible";
+            inherit: "default" 0.0;
+            rel.to_x: "e.procstats.swallow";
+         }
       }
    }
    programs {
@@ -709,11 +714,13 @@ group { name: "e/widgets/border/default/border";
       program { signal: "e,state,procstats,on"; source: "e";
          action: STATE_SET "visible" 0.0;
          target: "e.procstats.swallow";
+         target: "e.swallow.volume";
          target: "procstats";
       }
       program { signal: "e,state,procstats,off"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.procstats.swallow";
+         target: "e.swallow.volume";
          target: "procstats";
       }
 //      program {

data/elementary/themes/edc/efl/win.edc

@@ -5,7 +5,7 @@ group { "efl/win";
       swallow { "efl.menu";
          clip_to: "client_clip";
          desc { "default";
-            rel2.relative: 1 0;
+            rel2.relative: 1.0 0.0;
             link.base: "efl,action,hide" "efl";
             align: 0.5 0.0;
             hid;
@@ -23,7 +23,7 @@ group { "efl/win";
          }
          desc { "with_menu";
             rel1.to: "efl.menu";
-            rel1.relative: 0 1;
+            rel1.relative: 0.0 1.0;
             link.base: "efl,action,show_menu" "efl";
          }
       }

data/elementary/themes/edc/elm/border.edc

@@ -556,7 +556,7 @@ group { name: "elm/border/base/default";
          desc { "hidden";
             inherit: "default";
             rel1 { relative: 0.0 1.0; offset: 0 0; }
-            rel2 { relative: 1.0 1.0; offset: 0 0; }
+            rel2 { relative: 1.0 1.0; offset: -1 0; }
             min: 0 0;
             hid;
          }

data/elementary/themes/edc/elm/inwin.edc

@@ -3,7 +3,7 @@ group { name: "elm/win/inwin/default";
    parts {
       part { name: "bg"; type: RECT; mouse_events: 1;
          description { state: "default" 0.0;
-            color_class: "dim/normal/inwin";
+            color_class: "/dim/normal/inwin";
             color: 255 255 255 0; // no cc
          }
          description { state: "visible" 0.0;

data/elementary/themes/edc/elm/win.edc

@@ -7,17 +7,17 @@ group { name: "elm/win/base/default";
          clip_to: "client_clip";
          desc { "default";
             rel1.offset: 0 -1;
-            rel2.relative: 1 0;
+            rel2.relative: -1 -1;
             align: 0.5 0.0;
             hid;
             link.base: "elm,action,hide" "elm";
             min: 0 20;
+            fixed: 1 1;
          }
          desc { "visible";
             inherit: "default";
             rel1.offset: 0 0;
             rel2.offset: -1 0;
-            fixed: 0 1;
             vis;
             link.base: "elm,action,show_menu" "elm";
          }
@@ -27,7 +27,7 @@ group { name: "elm/win/base/default";
          desc { "default"; }
          desc { "with_menu";
             rel1.to: "elm.swallow.menu";
-            rel1.relative: 0 1;
+            rel1.relative: 0.0 1.0;
             link.base: "elm,action,show_menu" "elm";
          }
       }

meson.build

@@ -1,5 +1,5 @@
 project('efl', ['c','cpp'],
-  version: '1.25.99',
+  version: '1.26.1',
   default_options : ['buildtype=plain', 'cpp_std=c++11'],
   meson_version : '>=0.50'
 )

src/lib/edje/edje_entry.c

@@ -2002,8 +2002,8 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
         _edje_emit(ed, "entry,key,backspace", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
-   else if (!strcmp(ev->key, "Delete") ||
-            (!strcmp(ev->key, "KP_Delete") && !ev->string))
+   else if ((!strcmp(ev->key, "Delete") ||
+             (!strcmp(ev->key, "KP_Delete") && !ev->string)) && (!shift))
      {
         _compose_seq_reset(en);
         if (control)
@@ -2083,9 +2083,9 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
 #if defined(__APPLE__) && defined(__MACH__)
-   else if ((super) && (!shift) && (!strcmp(ev->key, "v")))
+   else if (((super) && (!shift) && (!strcmp(ev->key, "v"))) || ((shift) && (!super) && (!strcmp(ev->key, "Insert"))))
 #else
-   else if ((control) && (!shift) && (!strcmp(ev->key, "v")))
+   else if (((control) && (!shift) && (!strcmp(ev->key, "v"))) || ((shift) && (!control) && (!strcmp(ev->key, "Insert"))))
 #endif
      {
         _compose_seq_reset(en);
@@ -2131,6 +2131,13 @@ _edje_key_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
         _edje_emit(ed, "entry,cut,notify", rp->part->name);
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
      }
+   else if ((!strcmp(ev->key, "Delete") ||
+             (!strcmp(ev->key, "KP_Delete") && !ev->string)) && (shift))
+     {
+        _compose_seq_reset(en);
+        _edje_emit(ed, "entry,cut,notify", rp->part->name);
+        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+     }
 #if defined(__APPLE__) && defined(__MACH__)
    else if ((super) && (!strcmp(ev->key, "z")))
 #else