Adjust temp size to the gadcon when desciption is hidden

BodhiDev · Nov 30, 2020 · 06ceb88 · 06ceb88
1 parent e4aaa96
commit 06ceb88
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/forecasts.edc b/forecasts.edc
@@ -130,6 +130,21 @@ collections {
            }
            }
            description {
+           state: "hidden" 0.0;
+           inherit: "default" 0.0;
+                   rel1 {
+                         relative: 0.0 0.0;
+                         offset:   0   0;
+                         to: "icon";
+                   }
+                   rel2 {
+                         relative: 1.0 1.0;
+                         offset:   -1  -1;
+                         to:       "icon";
+                   }
+                   text.align: 0.5 1.0;
+           }
+           description {
            state: "float" 0.0;
            inherit: "default" 0.0;
                    rel1 {
@@ -659,20 +674,23 @@ collections {
            source: "e";
            action: STATE_SET "hidden" 0.0;
            target: "e.text.description";
+           target: "e.text.temp";
        }
        program {
            name: "text_show_default";
            signal: "e,state,description,show,default";
            source: "e";
            action: STATE_SET "default" 0.0;
            target: "e.text.description";
+           target: "e.text.temp";
        }
        program {
            name: "text_show_float";
            signal: "e,state,description,show,float";
            source: "e";
            action: STATE_SET "float" 0.0;
            target: "e.text.description";
+           target: "e.text.temp";
        } 
        program {
            name: "float";

diff --git a/src/e_mod_main.c b/src/e_mod_main.c
@@ -670,9 +670,9 @@ _fc_display_set(Instance *inst, Eina_Bool ok __UNUSED__)
    else
      if (inst->gcc->gadcon->orient == E_GADCON_ORIENT_FLOAT)
         edje_object_signal_emit(inst->forecasts_obj, "e,state,description,show,float", "e");
-     else   
-        edje_object_signal_emit(inst->forecasts_obj, "e,state,description,show,def", "e"); 
- 
+     else
+        edje_object_signal_emit(inst->forecasts_obj, "e,state,description,show,default", "e");
+
    if (inst->gcc->gadcon->orient == E_GADCON_ORIENT_FLOAT)
    snprintf(buf, sizeof(buf), "%d °%c", inst->condition.temp, inst->units.temp);
    else