Fix layout's part max size and spinners callbacks assignment in code sample
authorVladyslav Shevchenko <v.shevchenko@samsung.com>
Tue, 8 Sep 2015 15:08:40 +0000 (18:08 +0300)
committerVladyslav Shevchenko <v.shevchenko@samsung.com>
Tue, 8 Sep 2015 15:10:16 +0000 (18:10 +0300)
Change-Id: Ie60fd9a685d09c8cf66616e2a785509f65b86350
Signed-off-by: Vladyslav Shevchenko <v.shevchenko@samsung.com>
org.tizen.ui.practices/html/native/efl/edje_scaling_n.htm

index 694956d..a86b0b1 100644 (file)
@@ -252,7 +252,7 @@ group
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{ 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;state: &quot;default&quot; 0.0;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;align: 0.0 0.0;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max: 200 48;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max: 220 48;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rel1 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;relative: 1.0 0.0;
@@ -274,7 +274,7 @@ group
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{ 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;state: &quot;default&quot; 0.0;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;align: 0.0 0.0;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max: 200 48;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max: 220 48;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rel1 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;relative: 1.0 0.0;
@@ -417,7 +417,7 @@ elm_spinner_min_max_set(ad-&gt;edje_object_scale, 1, 300);
 elm_spinner_step_set(ad-&gt;edje_object_scale, 10);
 evas_object_show(ad-&gt;edje_object_scale);
 elm_spinner_value_set(ad-&gt;edje_object_scale, 100);
-elm_object_part_content_set(ad-&gt;main_layout, &quot;scale.swallow2&quot;, ad-&gt;edje_scale);</pre>
+elm_object_part_content_set(ad-&gt;main_layout, &quot;scale.swallow2&quot;, ad-&gt;edje_object_scale);</pre>
 </li>
 
 <li><p>Display the window:</p>
@@ -435,22 +435,22 @@ evas_object_show(ad-&gt;win);</pre>
 
 <ol>
 <li>
-<p>Add a callback for the second spinner that changes Edje global scale value and, as a result, affects all loaded Edje objects:</p>
+<p>Add a callback for the first spinner that changes Edje global scale value and, as a result, affects all loaded Edje objects:</p>
 
 <pre class="prettyprint">static void
 create_base_gui(appdata_s *ad)
 {
 &nbsp;&nbsp;&nbsp;// Add scale spinners
-&nbsp;&nbsp;&nbsp;ad-&gt;edje_object_scale = elm_spinner_add(ad-&gt;win);
-&nbsp;&nbsp;&nbsp;evas_object_size_hint_weight_set(ad-&gt;edje_object_scale, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-&nbsp;&nbsp;&nbsp;evas_object_size_hint_align_set(ad-&gt;edje_object_scale, EVAS_HINT_FILL, EVAS_HINT_FILL);
-&nbsp;&nbsp;&nbsp;elm_spinner_min_max_set(ad-&gt;edje_object_scale, 1, 300);
-&nbsp;&nbsp;&nbsp;elm_spinner_step_set(ad-&gt;edje_object_scale, 10);
-&nbsp;&nbsp;&nbsp;evas_object_show(ad-&gt;edje_object_scale);
-&nbsp;&nbsp;&nbsp;elm_spinner_value_set(ad-&gt;edje_object_scale, 100);
-&nbsp;&nbsp;&nbsp;elm_object_part_content_set(ad-&gt;main_layout, &quot;scale.swallow2&quot;, ad-&gt;edje_object_scale);
+&nbsp;&nbsp;&nbsp;ad-&gt;edje_scale = elm_spinner_add(ad-&gt;win);
+&nbsp;&nbsp;&nbsp;evas_object_size_hint_weight_set(ad-&gt;edje_scale, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+&nbsp;&nbsp;&nbsp;evas_object_size_hint_align_set(ad-&gt;edje_scale, EVAS_HINT_FILL, EVAS_HINT_FILL);
+&nbsp;&nbsp;&nbsp;elm_spinner_min_max_set(ad-&gt;edje_scale, 1, 300);
+&nbsp;&nbsp;&nbsp;elm_spinner_step_set(ad-&gt;edje_scale, 10);
+&nbsp;&nbsp;&nbsp;evas_object_show(ad-&gt;edje_scale);
+&nbsp;&nbsp;&nbsp;elm_spinner_value_set(ad-&gt;edje_scale, 100);
+&nbsp;&nbsp;&nbsp;elm_object_part_content_set(ad-&gt;main_layout, &quot;scale.swallow&quot;, ad-&gt;edje_scale);
 
-&nbsp;&nbsp;&nbsp;evas_object_smart_callback_add(ad-&gt;edje_object_scale, &quot;changed&quot;, _on_global_scale_change, ad);
+&nbsp;&nbsp;&nbsp;evas_object_smart_callback_add(ad-&gt;edje_scale, &quot;changed&quot;, _on_global_scale_change, ad);
 }</pre>
 </li>
 
@@ -484,7 +484,7 @@ _on_global_scale_change(void *data, Evas_Object *obj, void *event_info)
 
 <h2 id="set" name="set">Setting Scales for Edje Objects</h2>
 
-<p>Add a callback to get the value of the first spinner and apply it to the Edje object on the right:</p>
+<p>Add a callback to get the value of the second spinner and apply it to the Edje object on the right:</p>
 
 <pre class="prettyprint">static void
 _on_scale_change(void *data, Evas_Object *obj, void *event_info)
@@ -497,15 +497,15 @@ static void
 create_base_gui(appdata_s *ad)
 {
 &nbsp;&nbsp;&nbsp;// Add scale spinners
-&nbsp;&nbsp;&nbsp;ad-&gt;edje_scale = elm_spinner_add(ad-&gt;win);
-&nbsp;&nbsp;&nbsp;evas_object_size_hint_weight_set(ad-&gt;edje_scale, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-&nbsp;&nbsp;&nbsp;evas_object_size_hint_align_set(ad-&gt;edje_scale, EVAS_HINT_FILL, EVAS_HINT_FILL);
-&nbsp;&nbsp;&nbsp;elm_spinner_min_max_set(ad-&gt;edje_scale, 1, 300);
-&nbsp;&nbsp;&nbsp;elm_spinner_step_set(ad-&gt;edje_scale, 10);
-&nbsp;&nbsp;&nbsp;evas_object_show(ad-&gt;edje_scale);
-&nbsp;&nbsp;&nbsp;elm_spinner_value_set(ad-&gt;edje_scale, 100);
-&nbsp;&nbsp;&nbsp;elm_object_part_content_set(ad-&gt;main_layout, &quot;scale.swallow&quot;, ad-&gt;edje_scale);
-&nbsp;&nbsp;&nbsp;evas_object_smart_callback_add(ad-&gt;edje_scale, &quot;changed&quot;, _on_scale_change, ad);
+&nbsp;&nbsp;&nbsp;ad-&gt;edje_object_scale = elm_spinner_add(ad-&gt;win);
+&nbsp;&nbsp;&nbsp;evas_object_size_hint_weight_set(ad-&gt;edje_object_scale, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+&nbsp;&nbsp;&nbsp;evas_object_size_hint_align_set(ad-&gt;edje_object_scale, EVAS_HINT_FILL, EVAS_HINT_FILL);
+&nbsp;&nbsp;&nbsp;elm_spinner_min_max_set(ad-&gt;edje_object_scale, 1, 300);
+&nbsp;&nbsp;&nbsp;elm_spinner_step_set(ad-&gt;edje_object_scale, 10);
+&nbsp;&nbsp;&nbsp;evas_object_show(ad-&gt;edje_object_scale);
+&nbsp;&nbsp;&nbsp;elm_spinner_value_set(ad-&gt;edje_object_scale, 100);
+&nbsp;&nbsp;&nbsp;elm_object_part_content_set(ad-&gt;main_layout, &quot;scale.swallow2&quot;, ad-&gt;edje_object_scale);
+&nbsp;&nbsp;&nbsp;evas_object_smart_callback_add(ad-&gt;edje_object_scale, &quot;changed&quot;, _on_scale_change, ad);
 }</pre>
 
 
@@ -602,7 +602,7 @@ group
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{ 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;state: &quot;default&quot; 0.0;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;align: 0.0 0.0;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max: 200 48;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max: 220 48;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rel1 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;relative: 1.0 0.0;
@@ -624,7 +624,7 @@ group
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{ 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;state: &quot;default&quot; 0.0;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;align: 0.0 0.0;
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max: 200 48;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;max: 220 48;
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;rel1 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;relative: 1.0 0.0;