hermet pushed a commit to branch elementary-1.9.

http://git.enlightenment.org/core/elementary.git/commit/?id=098797db358872a931764c31bada4de96be98d2f

commit 098797db358872a931764c31bada4de96be98d2f
Author: ChunEon Park <[email protected]>
Date:   Mon Mar 17 00:27:06 2014 +0900

    entry - entry did word wrapping even the mode was ELM_WRAP_NONE.
    
    The ELM_WRAP_NONE mode should not have word wrap textblock style.
    
    @fix
---
 data/themes/edc/elm/entry.edc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/data/themes/edc/elm/entry.edc b/data/themes/edc/elm/entry.edc
index eafacb2..75da5ee 100644
--- a/data/themes/edc/elm/entry.edc
+++ b/data/themes/edc/elm/entry.edc
@@ -442,10 +442,18 @@ group { name: "elm/entry/base/default";
          base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom 
shadow_color=#00000080 wrap=word text_class=entry color_class=entry 
left_margin=2 right_margin=2";
          ENABLED_TEXTBLOCK_TAGS
       }
+      style { name: "entry_nowrap_style";
+         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom 
shadow_color=#00000080 text_class=entry color_class=entry left_margin=2 
right_margin=2";
+         ENABLED_TEXTBLOCK_TAGS
+      }
       style { name: "entry_disabled_style";
          base: "font="FN" font_size=10 color=#151515 style=shadow,bottom 
shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_disabled 
left_margin=2 right_margin=2";
          DISABLED_TEXTBLOCK_TAGS
       }
+      style { name: "entry_nowrap_disabled_style";
+         base: "font="FN" font_size=10 color=#151515 style=shadow,bottom 
shadow_color=#ffffff19 text_class=entry color_class=entry_disabled 
left_margin=2 right_margin=2";
+         DISABLED_TEXTBLOCK_TAGS
+      }
       style { name: "entry_guide_style";
          base: "font="FN" font_size=10 color=#000000 style=shadow,bottom 
shadow_color=#ffffff19 wrap=word text_class=entry color_class=entry_guide 
left_margin=2 right_margin=2 ellipsis=0.0";
          DISABLED_TEXTBLOCK_TAGS
@@ -671,14 +679,14 @@ group { name: "elm/entry/base-nowrap/default";
       }
       part { name: "elm.text";
          description { state: "default" 0.0;
-            text { style: "entry_style";
+            text { style: "entry_nowrap_style";
                min: 1 1;
                align: 0.0 0.0;
             }
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            text { style: "entry_disabled_style";
+            text { style: "entry_nowrap_disabled_style";
                min: 0 1;
             }
          }

-- 


Reply via email to