callscreen: fix keypad when there are 2 calls.
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>
Thu, 30 Aug 2012 00:12:42 +0000 (21:12 -0300)
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>
Thu, 30 Aug 2012 00:12:42 +0000 (21:12 -0300)
Before the top call was always the active, the second was alway
held. During keypad operation we hide the held, making enough room for
keypad. Not anymore and the keypad was overlapping with the second
call.

Now the keyboard size is reduced in height to make it fit.

data/themes/includes/call.edc

index 48a4f55..e477185 100644 (file)
@@ -1073,11 +1073,11 @@ group {
          description {
             state: "default" 0.0;
             color: 0 0 0 0;
-            min: WIDTH (ACTION_HEIGHT * 4);
-            max: WIDTH (ACTION_HEIGHT * 4); /* keep it tight centered */
+            min: WIDTH (HEIGHT - 2 * CALL_HEIGHT - 2 * ACTION_HEIGHT - 4 * SEPARATOR_HEIGHT);
+            max: WIDTH (HEIGHT - 2 * CALL_HEIGHT - 2 * ACTION_HEIGHT - 4 * SEPARATOR_HEIGHT); /* keep it tight centered */
             rel1 {
                relative: 0.0 0.0;
-               offset: 0 (-ACTION_HEIGHT * 4 - SEPARATOR_HEIGHT);
+               offset: 0 (-HEIGHT + 2 * CALL_HEIGHT + 2 * ACTION_HEIGHT + 3 * SEPARATOR_HEIGHT);
                to_y: "button.hide-keypad";
             }
             rel2 {
@@ -1236,12 +1236,12 @@ group {
             rel1 {
                to_y: "button.hangup";
                relative: 0.0 -1.0;
-               offset: 0 (ACTION_HEIGHT * 4 + SEPARATOR_HEIGHT);
+               offset: 0 (HEIGHT - 2 * CALL_HEIGHT - 2 * ACTION_HEIGHT - 4 * SEPARATOR_HEIGHT);
             }
             rel2 {
                to_y: "button.hangup";
                relative: 1.0 0.0;
-               offset: -1 (ACTION_HEIGHT * 4 + SEPARATOR_HEIGHT - 1);
+               offset: -1 (HEIGHT - 2 * CALL_HEIGHT - 2 * ACTION_HEIGHT - 4 * SEPARATOR_HEIGHT - 1);
             }
          }
          description {