[copy&paste] improved selection handler feature

diff --git a/themes/groups/entry.edc b/themes/groups/entry.edc
index bb4a105..1c2949b 100644 (file)
--- a/themes/groups/entry.edc
+++ b/themes/groups/entry.edc
@@ -1576,9 +1576,12 @@ group { name: "elm/entry/base-password/popup";
 /////////////////////////////////////////////////////////////////////////
        group { name: "elm/entry/selection/block_handle_left";
                data.item: "position" "BOTTOM";
+               data.item: "height" "40";
                images {
                  image: "copy&paste_Icon_left.png" COMP;
                  image: "copy&paste_Icon_left_press.png" COMP;
+                 image: "copy&paste_Icon_left_top.png" COMP;
+                 image: "copy&paste_Icon_left_top_press.png" COMP;
                }
                parts {
                        part { name: "bg";
@@ -1626,16 +1629,35 @@ group { name: "elm/entry/base-password/popup";
                                        inherit: "default" 0.0;
                                        visible: 1;
                                }
+                               description { state: "top" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                                       align: 1 1;
+                                       image {
+                                               normal: "copy&paste_Icon_left_top.png";
+                                       }
+                               }
                                description { state: "press" 0.0;
                                        inherit: "default" 0.0;
                                        visible: 1;
                                        image {
                                                normal: "copy&paste_Icon_left_press.png";
-                                               border: 0 0 0 0;
+                                       }
+                               }
+                               description { state: "top_press" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                                       align: 1 1;
+                                       image {
+                                               normal: "copy&paste_Icon_left_top_press.png";
                                        }
                                }
                        }
                }
+               script {
+                       public handler_ontop;
+                       public handler_pressed;
+               }
                programs {
                        program { name: "focused";
                                signal: "elm,action,focus";
@@ -1643,6 +1665,7 @@ group { name: "elm/entry/base-password/popup";
                                action: STATE_SET "show" 0.0;
                                target: "handle";
                                target: "bg";
+                               after: "unpressed";
                        }
                        program { name: "unfocused";
                                signal: "elm,action,unfocus";
@@ -1651,44 +1674,71 @@ group { name: "elm/entry/base-password/popup";
                                target: "handle";
                                target: "bg";
                        }
+                       program { name: "top";
+                       signal: "elm,state,top";
+                               source: "elm";
+                               script {
+                                       new pressed;
+                                       pressed = get_int(handler_pressed);
+                                       set_int(handler_ontop, 1);
+                                       if (pressed)
+                                               set_state(PART:"handle", "top_press", 0.0);
+                                       else
+                                               set_state(PART:"handle", "top", 0.0);
+                               }
+                       }
+                       program { name: "bottom";
+                       signal: "elm,state,bottom";
+                               source: "elm";
+                               script {
+                                       new pressed;
+                                       pressed = get_int(handler_pressed);
+                                       set_int(handler_ontop, 0);
+                                       if (pressed)
+                                               set_state(PART:"handle", "press", 0.0);
+                                       else
+                                               set_state(PART:"handle", "show", 0.0);
+                               }
+                       }
                        program { name: "pressed";
                                signal: "mouse,down,1";
                                source: "handle";
-                               action: STATE_SET "press" 0.0;
-                               target: "handle";
+                               script {
+                                       new pos;
+                                       pos = get_int(handler_ontop);
+                                       set_int(handler_pressed, 1);
+                                       if (pos)
+                                               set_state(PART:"handle", "top_press", 0.0);
+                                       else
+                                               set_state(PART:"handle", "press", 0.0);
+                               }
                        }
                        program { name: "unpressed";
                                signal: "mouse,up,1";
                                source: "handle";
-                               action: STATE_SET "show" 0.0;
-                               target: "handle";
+                               script {
+                                       new pos;
+                                       pos = get_int(handler_ontop);
+                                       set_int(handler_pressed, 0);
+                                       if (pos)
+                                               set_state(PART:"handle", "top", 0.0);
+                                       else
+                                               set_state(PART:"handle", "show", 0.0);
+                               }
                        }
                }
        }
 
        group { name: "elm/entry/selection/block_handle_right";
                data.item: "position" "BOTH";
+               data.item: "height" "20";
                images {
                  image: "copy&paste_Icon_right.png" COMP;
                  image: "copy&paste_Icon_right_press.png" COMP;
+                 image: "copy&paste_Icon_right_top.png" COMP;
+                 image: "copy&paste_Icon_right_top_press.png" COMP;
                }
                parts {
-/*                     part { name: "bg";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 1;
-                               description { state: "default" 0.0;
-                                       visible: 0;
-                                       fixed: 1 1;
-                                       align: 0.5 0.25;
-                                       min: 50 80;
-                                       color: 0 0 0 0;
-                               }
-                               description { state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                               }
-                       }*/
                        part { name: "handle";
                                mouse_events: 1;
                                scale: 1;
@@ -1716,42 +1766,100 @@ group { name: "elm/entry/base-password/popup";
                                        inherit: "default" 0.0;
                                        visible: 1;
                                }
+                               description { state: "top" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                                       align: 0 1;
+                                       image {
+                                               normal: "copy&paste_Icon_right_top.png";
+                                       }
+                               }
                                description { state: "press" 0.0;
                                        inherit: "default" 0.0;
                                        visible: 1;
                                        image {
                                                normal: "copy&paste_Icon_right_press.png";
-                                               border: 0 0 0 0;
+                                       }
+                               }
+                               description { state: "top_press" 0.0;
+                                       inherit: "default" 0.0;
+                                       visible: 1;
+                                       align: 0 1;
+                                       image {
+                                               normal: "copy&paste_Icon_right_top_press.png";
                                        }
                                }
                        }
                }
+               script {
+                       public handler_ontop;
+                       public handler_pressed;
+               }
                programs {
                        program { name: "focused";
                                signal: "elm,action,focus";
                                source: "elm";
                                action: STATE_SET "show" 0.0;
                                target: "handle";
-//                             target: "bg";
+                               after: "unpressed";
                        }
                        program { name: "unfocused";
                                signal: "elm,action,unfocus";
                                source: "elm";
                                action: STATE_SET "default" 0.0;
                                target: "handle";
-//                             target: "bg";
+                       }
+                       program { name: "top";
+                       signal: "elm,state,top";
+                               source: "elm";
+                               script {
+                                       new pressed;
+                                       pressed = get_int(handler_pressed);
+                                       set_int(handler_ontop, 1);
+                                       if (pressed)
+                                               set_state(PART:"handle", "top_press", 0.0);
+                                       else
+                                               set_state(PART:"handle", "top", 0.0);
+                               }
+                       }
+                       program { name: "bottom";
+                       signal: "elm,state,bottom";
+                               source: "elm";
+                               script {
+                                       new pressed;
+                                       pressed = get_int(handler_pressed);
+                                       set_int(handler_ontop, 0);
+                                       if (pressed)
+                                               set_state(PART:"handle", "press", 0.0);
+                                       else
+                                               set_state(PART:"handle", "show", 0.0);
+                               }
                        }
                        program { name: "pressed";
                                signal: "mouse,down,1";
                                source: "handle";
-                               action: STATE_SET "press" 0.0;
-                               target: "handle";
+                               script {
+                                       new pos;
+                                       pos = get_int(handler_ontop);
+                                       set_int(handler_pressed, 1);
+                                       if (pos)
+                                               set_state(PART:"handle", "top_press", 0.0);
+                                       else
+                                               set_state(PART:"handle", "press", 0.0);
+                               }
                        }
                        program { name: "unpressed";
                                signal: "mouse,up,1";
                                source: "handle";
-                               action: STATE_SET "show" 0.0;
-                               target: "handle";
+                               script {
+                                       new pos;
+                                       pos = get_int(handler_ontop);
+                                       set_int(handler_pressed, 0);
+                                       if (pos)
+                                               set_state(PART:"handle", "top", 0.0);
+                                       else
+                                               set_state(PART:"handle", "show", 0.0);
+                               }
                        }
                }
        }

diff --git a/themes/images/nbeat-black-hd/copy&paste_Icon_left_top.png b/themes/images/nbeat-black-hd/copy&paste_Icon_left_top.png
new file mode 100644 (file)
index 0000000..ebe24a4
Binary files /dev/null and b/themes/images/nbeat-black-hd/copy&paste_Icon_left_top.png differ

diff --git a/themes/images/nbeat-black-hd/copy&paste_Icon_left_top_press.png b/themes/images/nbeat-black-hd/copy&paste_Icon_left_top_press.png
new file mode 100644 (file)
index 0000000..b715059
Binary files /dev/null and b/themes/images/nbeat-black-hd/copy&paste_Icon_left_top_press.png differ

diff --git a/themes/images/nbeat-black-hd/copy&paste_Icon_right_top.png b/themes/images/nbeat-black-hd/copy&paste_Icon_right_top.png
new file mode 100644 (file)
index 0000000..300eebc
Binary files /dev/null and b/themes/images/nbeat-black-hd/copy&paste_Icon_right_top.png differ

diff --git a/themes/images/nbeat-black-hd/copy&paste_Icon_right_top_press.png b/themes/images/nbeat-black-hd/copy&paste_Icon_right_top_press.png
new file mode 100644 (file)
index 0000000..1dc1ad1
Binary files /dev/null and b/themes/images/nbeat-black-hd/copy&paste_Icon_right_top_press.png differ

diff --git a/themes/images/nbeat-black/copy&paste_Icon_left_top.png b/themes/images/nbeat-black/copy&paste_Icon_left_top.png
new file mode 100644 (file)
index 0000000..ebe24a4
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_Icon_left_top.png differ

diff --git a/themes/images/nbeat-black/copy&paste_Icon_left_top_press.png b/themes/images/nbeat-black/copy&paste_Icon_left_top_press.png
new file mode 100644 (file)
index 0000000..b715059
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_Icon_left_top_press.png differ

diff --git a/themes/images/nbeat-black/copy&paste_Icon_right_top.png b/themes/images/nbeat-black/copy&paste_Icon_right_top.png
new file mode 100644 (file)
index 0000000..300eebc
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_Icon_right_top.png differ

diff --git a/themes/images/nbeat-black/copy&paste_Icon_right_top_press.png b/themes/images/nbeat-black/copy&paste_Icon_right_top_press.png
new file mode 100644 (file)
index 0000000..1dc1ad1
Binary files /dev/null and b/themes/images/nbeat-black/copy&paste_Icon_right_top_press.png differ

diff --git a/themes/images/nbeat-hd/copy&paste_Icon_left_top.png b/themes/images/nbeat-hd/copy&paste_Icon_left_top.png
new file mode 100644 (file)
index 0000000..72bab7b
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_Icon_left_top.png differ

diff --git a/themes/images/nbeat-hd/copy&paste_Icon_left_top_press.png b/themes/images/nbeat-hd/copy&paste_Icon_left_top_press.png
new file mode 100644 (file)
index 0000000..e45ceed
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_Icon_left_top_press.png differ

diff --git a/themes/images/nbeat-hd/copy&paste_Icon_right_top.png b/themes/images/nbeat-hd/copy&paste_Icon_right_top.png
new file mode 100644 (file)
index 0000000..300eebc
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_Icon_right_top.png differ

diff --git a/themes/images/nbeat-hd/copy&paste_Icon_right_top_press.png b/themes/images/nbeat-hd/copy&paste_Icon_right_top_press.png
new file mode 100644 (file)
index 0000000..7fe1c6b
Binary files /dev/null and b/themes/images/nbeat-hd/copy&paste_Icon_right_top_press.png differ

diff --git a/themes/images/nbeat/copy&paste_Icon_left_top.png b/themes/images/nbeat/copy&paste_Icon_left_top.png
new file mode 100644 (file)
index 0000000..f27fbdc
Binary files /dev/null and b/themes/images/nbeat/copy&paste_Icon_left_top.png differ

diff --git a/themes/images/nbeat/copy&paste_Icon_left_top_press.png b/themes/images/nbeat/copy&paste_Icon_left_top_press.png
new file mode 100644 (file)
index 0000000..9fd230c
Binary files /dev/null and b/themes/images/nbeat/copy&paste_Icon_left_top_press.png differ

diff --git a/themes/images/nbeat/copy&paste_Icon_right_top.png b/themes/images/nbeat/copy&paste_Icon_right_top.png
new file mode 100644 (file)
index 0000000..012ffa3
Binary files /dev/null and b/themes/images/nbeat/copy&paste_Icon_right_top.png differ

diff --git a/themes/images/nbeat/copy&paste_Icon_right_top_press.png b/themes/images/nbeat/copy&paste_Icon_right_top_press.png
new file mode 100644 (file)
index 0000000..9602720
Binary files /dev/null and b/themes/images/nbeat/copy&paste_Icon_right_top_press.png differ