diff options
| author | Andy Williams <andy@andywilliams.me> | 2017-03-10 22:14:29 +0000 |
|---|---|---|
| committer | Andy Williams <andy@andywilliams.me> | 2017-03-10 22:14:29 +0000 |
| commit | b7ea8fc01e7eaacf7e7a38f79a654811d1a5b26f (patch) | |
| tree | c4e3dc1992f767150b1b86dedf82fc68471b2fc8 /data | |
| parent | 9d8bc92c4a3e1e8452935ed9f54f3b8c09789e7b (diff) | |
luncher: Update theme to ensure we're sending scale reset signls
Diffstat (limited to 'data')
| -rw-r--r-- | data/elementary/themes/edc/luncher.edc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/data/elementary/themes/edc/luncher.edc b/data/elementary/themes/edc/luncher.edc index 329fd88778..9b1779c2de 100644 --- a/data/elementary/themes/edc/luncher.edc +++ b/data/elementary/themes/edc/luncher.edc @@ -46,7 +46,7 @@ group { name: "e/gadget/luncher/icon"; public current_size; public Float:engage_scale(cursorpos, iconpos, size) { new Float:zoom = 1.5; - new Float:scale = (zoom+0.25) - (abs(cursorpos-(iconpos+size/2)) / (size*2)); + new Float:scale = (zoom+0.25) - (abs(cursorpos-(iconpos+size/3)) / (size*3)); if (scale < 1.0) scale = 1.0; if (scale > zoom) scale = zoom; @@ -93,50 +93,47 @@ group { name: "e/gadget/luncher/icon"; } } else if (!strcmp(s, "engage")) { - set_state_anim(PART:"sizer", "default", 0.0, LINEAR, 1.0); + new Float:scale = 1.0; if (pos == 0 && (xpos >= x) && (xpos <= (x+w))) { - new Float:scale = engage_scale(ypos, y, h); + scale = engage_scale(ypos, y, h); new Float:halfscale = scale/2; custom_state(PART:"sizer", "default", 0.0); set_state_val(PART:"sizer", STATE_REL1, 0.0, 0.5-halfscale); set_state_val(PART:"sizer", STATE_REL2, scale, 0.5+halfscale); set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0); - send_message(MSG_STRING_FLOAT_SET, 1, "Scale", scale); } else if (pos == 1 && (ypos >= y) && (ypos <= (y+h))) { - new Float:scale = engage_scale(xpos, x, w); + scale = engage_scale(xpos, x, w); new Float:halfscale = scale/2; custom_state(PART:"sizer", "default", 0.0); set_state_val(PART:"sizer", STATE_REL1, 0.5-halfscale, 0.0); set_state_val(PART:"sizer", STATE_REL2, 0.5+halfscale, scale); set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0); - send_message(MSG_STRING_FLOAT_SET, 1, "Scale", scale); } else if (pos == 2 && (xpos >= x) && (xpos <= (x+w))) { - new Float:scale = engage_scale(ypos, y, h); + scale = engage_scale(ypos, y, h); new Float:halfscale = scale/2; custom_state(PART:"sizer", "default", 0.0); set_state_val(PART:"sizer", STATE_REL1, 1.0-scale, 0.5-halfscale); set_state_val(PART:"sizer", STATE_REL2, 1.0, 0.5+halfscale); set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0); - send_message(MSG_STRING_FLOAT_SET, 1, "Scale", scale); } else if (pos == 3 && (ypos >= y) && (ypos <= (y+h))) { - new Float:scale = engage_scale(xpos, x, w); + scale = engage_scale(xpos, x, w); new Float:halfscale = scale/2; custom_state(PART:"sizer", "default", 0.0); set_state_val(PART:"sizer", STATE_REL1, 0.5-halfscale, 1.0-scale); set_state_val(PART:"sizer", STATE_REL2, 0.5+halfscale, 1.0); set_state_anim(PART:"sizer", "custom", 0.0, LINEAR, 1.0); - send_message(MSG_STRING_FLOAT_SET, 1, "Scale", scale); } else { set_state_anim(PART:"sizer", "default", 0.0, LINEAR, 1.0); } + send_message(MSG_STRING_FLOAT_SET, 1, "Scale", scale); emit("e,state,resized", "e"); } } |