gui: don't need to handle dark theme. default is dark now :)

This commit is contained in:
Daniel Juyung Seo 2013-11-06 12:37:27 +09:00
parent 87a1a53115
commit b472751be0
2 changed files with 2 additions and 100 deletions

View File

@ -4,99 +4,8 @@
#define POPUP_HEIGHT 100
collections {
// layout for default theme
group { name: "etv/main/layout";
parts {
part { name: "base";
type: RECT;
description { state: "default" 0.0;
}
}
part { name: "preview";
type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
min: PREVIEW_WIDTH 0;
rel1.to: "base";
rel2 {
to_x: "base";
to_y: "menu_bottom_line";
relative: 1.0 0.0;
}
align: 0.0 0.5;
}
}
part { name: "menu_bottom_line";
type: RECT;
scale: 1;
description { state: "default" 0.0;
min: 0 1;
fixed: 0 1;
color: 100 100 100 255;
rel1.to: "edje_name_txt";
rel2 {
to: "edje_name_txt";
relative: 1.0 0.0;
}
align: 0.5 1.0;
}
}
part { name: "edje_name_txt";
type: TEXT;
scale: 1;
description { state: "default" 0.0;
fixed: 0 1;
rel1 {
to: "base";
relative: 0.0 1.0;
}
rel2.to: "base";
align: 0.0 1.0;
color: 0 0 0 255;
text {
size: EDJE_NAME_TXT_SIZE;
min: 0 1;
align: 1.0 0.5;
}
}
}
part { name: "popup";
type: SWALLOW;
scale: 1;
description { state: "default" 0.0;
fixed: 1 1;
min: POPUP_WIDTH POPUP_HEIGHT;
max: POPUP_WIDTH POPUP_HEIGHT;
align: 0.5 0.0;
visible: 0;
rel1.relative: 0.0 1.0;
}
description { state: "visible" 0.0;
inherit: "default" 0.0;
visible: 1;
align: 0.5 0.5;
rel1.relative: 0.0 0.0;
}
}
program { name: "popup,show";
signal: "popup,show";
source: "elm";
action: STATE_SET "visible" 0.0;
transition: SPRING 1.2 2.0 6;
target: "popup";
}
program { name: "popup,hide";
signal: "popup,hide";
source: "elm";
action: STATE_SET "default" 0.0;
transition: DECELERATE 0.5;
target: "popup";
}
}
}
// layout for dark theme
group { name: "etv/main/layout_dark";
group { name: "etv/main/layout";
parts {
part { name: "base";
type: RECT;

View File

@ -371,14 +371,7 @@ gui_create(const char *edje_file,
// Main Layout
gd->gui_layout = o = elm_layout_add(gd->win);
snprintf(path, sizeof(path), "%s/themes/layout.edj", elm_app_data_dir_get());
// dark theme support
theme = elm_theme_get(NULL);
if (theme && !strncmp(theme, "dark", 4))
elm_layout_file_set(o, path, "etv/main/layout_dark");
else
elm_layout_file_set(o, path, "etv/main/layout");
elm_layout_file_set(o, path, "etv/main/layout");
EXPAND(o); FILL(o);
elm_box_pack_end(box, o);
evas_object_show(o);