viking

webkit based web browser for Enlightenment
Log | Files | Refs | LICENSE

commit f31ca016a61d61c7b663e75abe3a676a5712dc51
parent f7fbf21813d71d9a6594ef907ee5e1103a6ec04d
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Fri, 19 Oct 2012 22:43:27 -0600

edje: commit hack default

Diffstat:
Msrc/default.edc | 188++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
Msrc/window.c | 2+-
2 files changed, 177 insertions(+), 13 deletions(-)

diff --git a/src/default.edc b/src/default.edc @@ -1,14 +1,188 @@ collections { group { - name: "elm/box/base/default"; + name: "elm/label/base/highlighted"; parts { part { name: "base"; type: RECT; mouse_events: 1; + description { state: "default" 0.0; + color: 255 255 0 255; + } + } + part { name: "elm.swallow.content"; + type: SWALLOW; + mouse_events: 0; + description { state: "default" 0.0; + fixed: 1 0; + visible: 0; + align: 0.0 0.5; + rel1.offset: 4 4; + rel2.offset: 3 -5; + rel2.relative: 0.0 1.0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + aspect: 1.0 1.0; + aspect_preference: VERTICAL; + rel2.offset: 4 -5; + } + } + part { name: "elm.text"; + type: TEXT; + mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + rel1.to_x: "elm.swallow.content"; + rel1.relative: 1.0 0.0; + color: 0 0 0 255; + text { + font: "Monospace"; + size: 12; + min: 0 0; + text_class: "button"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + text.min: 1 1; + } description { state: "disabled" 0.0; + inherit: "default" 0.0; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + visible: 1; + text.min: 1 1; + } + } + programs { + program { name: "button_unclick"; + signal: "mouse,up,1"; + source: "base"; + action: SIGNAL_EMIT "elm,action,click" ""; + } + program { name: "button_click"; + signal: "mouse,down,1"; + source: "base"; + } + program { name: "text_show"; + signal: "elm,state,text,visible"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.swallow.content", st, 30, vl); + if (!strcmp(st, "icononly")) + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"elm.text", "visible", 0.0); + } + } + program { name: "text_hide"; + signal: "elm,state,text,hidden"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.swallow.content", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"elm.swallow.content", "icononly", 0.0); + set_state(PART:"elm.text", "default", 0.0); + } + } + program { name: "icon_show"; + signal: "elm,state,icon,visible"; + source: "elm"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"elm.swallow.content", "visible", 0.0); + else + set_state(PART:"elm.swallow.content", "icononly", 0.0); + } + } + program { name: "icon_hide"; + signal: "elm,state,icon,hidden"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.content"; + } + program { name: "disable"; + signal: "elm,state,disabled"; + source: "elm"; + action: STATE_SET "disabled" 0.0; + target: "base"; + after: "disable_text"; + } + program { name: "disable_text"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "visible")) + set_state(PART:"elm.text", "disabled_visible", 0.0); + else + set_state(PART:"elm.text", "disabled", 0.0); + } + } + program { name: "enable"; + signal: "elm,state,enabled"; + source: "elm"; + action: STATE_SET "default" 0.0; + target: "base"; + after: "enable_text"; + } + program { name: "enable_text"; + script { + new st[31]; + new Float:vl; + get_state(PART:"elm.text", st, 30, vl); + if (!strcmp(st, "disabled_visible")) + set_state(PART:"elm.text", "visible", 0.0); + else + set_state(PART:"elm.text", "default", 0.0); + } + } + } + } + } + group { + name: "inverted"; + parts { + part { name: "base"; + type: RECT; + description { state: "default" 0.0; color: 255 255 255 255; } } + part { name: "elm.swallow.content"; + type: SWALLOW; + description { state: "default" 0.0; + fixed: 1 0; + visible: 1; + align: 0.0 0.5; + aspect: 1.0 1.0; + aspect_preference: VERTICAL; + } + } + part { name: "elm.text"; + type: TEXT; + scale: 1; + description { state: "default" 0.0; + visible: 1; + color: 0 0 0 255; + text { + font: "Monospace"; + size: 12; + min: 0 0; + text_class: "button"; + } + } + } } } group { @@ -39,16 +213,6 @@ collections { aspect_preference: VERTICAL; rel2.offset: 4 -5; } - description { state: "icononly" 0.0; - inherit: "default" 0.0; - fixed: 0 0; - visible: 1; - align: 0.5 0.5; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - rel2.offset: -5 -5; - rel2.relative: 1.0 1.0; - } } part { name: "elm.text"; type: TEXT; @@ -61,7 +225,7 @@ collections { color: 0 0 0 255; text { font: "Monospace"; - size: 11; + size: 12; min: 0 0; text_class: "button"; } diff --git a/src/window.c b/src/window.c @@ -535,7 +535,7 @@ window_add(App_Data *ad, Session_Window *session_window) evas_object_size_hint_weight_set(url, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(url, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(box, url); - elm_entry_text_style_user_push(url, "DEFAULT='font=Monospace font_size=11'"); + elm_entry_text_style_user_push(url, "DEFAULT='font=Monospace font_size=12'"); evas_object_show(url); wd->win = win;