libburnia/experimental-legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make scale work a little better...

Browse Source
This commit is contained in:
Jaime Thomas 2009-01-16 04:07:47 +00:00
parent 4a702dd0fe
commit e497ce2104
12 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ecdb/trunk/data/themes/default/groups/burn_data.edc
View File

@ -58,6 +58,7 @@ group {
name: "ecdb/burn_data/return";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -80,6 +81,7 @@ group {
name: "ecdb/burn_data/begin";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -102,6 +104,7 @@ group {
name: "ecdb/burn_data/drive";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -124,6 +127,7 @@ group {
name: "ecdb/burn_data/speed";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -146,6 +150,7 @@ group {
name: "ecdb/burn_data/settings";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -169,6 +174,7 @@ group {
name: "ecdb/burn_data/filelist";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -191,6 +197,7 @@ group {
name: "ecdb/burn_data/capacity";
type: SWALLOW;
repeat_events: 0;
scale: 1;
description {
state: "default" 0.0;
@ -314,6 +321,7 @@ group {
name: "disabled_hack";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;

6
ecdb/trunk/data/themes/default/groups/burn_image.edc
View File

@ -79,6 +79,7 @@ group {
name: "ecdb/burn_image/return";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -101,6 +102,7 @@ group {
name: "ecdb/burn_image/begin";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -123,6 +125,7 @@ group {
name: "ecdb/burn_image/file";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -145,6 +148,7 @@ group {
name: "ecdb/burn_image/drive";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -167,6 +171,7 @@ group {
name: "ecdb/burn_image/speed";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -291,6 +296,7 @@ group {
name: "disabled_hack";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;

3
ecdb/trunk/data/themes/default/groups/button.edc
View File

@ -31,6 +31,7 @@ group {
name: "button_clip";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -54,6 +55,7 @@ group {
name: "focus_clip";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -209,6 +211,7 @@ group {
type: RECT;
mouse_events: 1;
clip_to: "button_clip";
scale: 1;
description {
state: "default" 0.0;

2
ecdb/trunk/data/themes/default/groups/capacity.edc
View File

@ -18,6 +18,7 @@ group {
name: "confine";
mouse_events: 0;
type: RECT;
scale: 1;
description {
state: "default" 0.0;
@ -104,6 +105,7 @@ group {
name: "draggie";
type: RECT;
clip_to: "confine";
scale: 1;
dragable {
confine: "confine";

1
ecdb/trunk/data/themes/default/groups/check.edc
View File

@ -59,6 +59,7 @@ group {
part {
name: "check_shadow";
type: IMAGE;
scale: 1;
description {
state: "default" 0.0;

4
ecdb/trunk/data/themes/default/groups/combo.edc
View File

@ -10,7 +10,6 @@ group {
description {
state: "default" 0.0;
color: 0 0 0 0;
min: 20 20;
rel1 {
relative: 0.0 0.0;
@ -85,6 +84,7 @@ group {
name: "focus_clip";
type: RECT;
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
@ -250,6 +250,7 @@ group {
part {
name: "ecdb.header.swallow";
type: SWALLOW;
scale: 1;
description {
state: "default" 0.0;
@ -388,6 +389,7 @@ group {
part {
name: "ecdb.box";
type: BOX;
scale: 1;
description {
state: "default" 0.0;

1
ecdb/trunk/data/themes/default/groups/config_inwin.edc
View File

@ -10,7 +10,6 @@ group {
description {
state: "default" 0.0;
color: 0 0 0 0;
min: 20 20;
rel1 {
relative: 0.0 0.0;

5
ecdb/trunk/data/themes/default/groups/erase_disc.edc
View File

@ -74,6 +74,7 @@ group {
name: "ecdb/erase/return";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -96,6 +97,7 @@ group {
name: "ecdb/erase/begin";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -118,6 +120,7 @@ group {
name: "ecdb/erase/speed";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -140,6 +143,7 @@ group {
name: "ecdb/erase/drive";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -264,6 +268,7 @@ group {
name: "disabled_hack";
type: RECT;
mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;

7
ecdb/trunk/data/themes/default/groups/welcome_page.edc
View File

@ -1,16 +1,17 @@
/* vim: set sw=3 ts=3 sts=3 expandtab: */
group {
name: "ecdb/welcome_page";
min: 640 170;
parts {
part {
name: "bg";
type: RECT;
scale: 1;
description {
state: "default" 0.0;
color: 0 0 0 0;
min: 640 170;
rel1 {
relative: 0.0 0.0;
@ -58,6 +59,7 @@ group {
name: "ecdb/burn_data";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -80,6 +82,7 @@ group {
name: "ecdb/burn_audio";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -102,6 +105,7 @@ group {
name: "ecdb/burn_image";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -124,6 +128,7 @@ group {
name: "ecdb/erase";
type: SWALLOW;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;

10
ecdb/trunk/data/themes/default/groups/window.edc
View File

@ -7,6 +7,7 @@ group {
part {
name: "background";
mouse_events: 0;
scale: 1;
description {
state: "default" 0.0;
@ -32,6 +33,7 @@ group {
part {
name: "paned_container";
type: RECT;
scale: 1;
description {
state: "default" 0.0;
@ -70,6 +72,7 @@ group {
part {
name: "paned_draggie";
type: RECT;
scale: 1;
dragable {
confine: "paned_container";
@ -102,6 +105,7 @@ group {
name: "paned_image";
repeat_events: 1;
type: IMAGE;
scale: 1;
description {
state: "default" 0.0;
@ -130,6 +134,7 @@ group {
part {
name: "filelist_clip";
type: RECT;
scale: 1;
description {
state: "default" 0.0;
@ -156,6 +161,7 @@ group {
name: "filelist_container";
type: IMAGE;
clip_to: "filelist_clip";
scale: 1;
description {
state: "default" 0.0;
@ -187,6 +193,7 @@ group {
name: "filelist";
type: SWALLOW;
clip_to: "filelist_clip";
scale: 1;
description {
state: "default" 0.0;
@ -209,6 +216,7 @@ group {
clip_to: "filelist_clip";
mouse_events: 1;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -242,6 +250,7 @@ group {
clip_to: "filelist_clip";
mouse_events: 1;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;
@ -278,6 +287,7 @@ group {
type: SWALLOW;
mouse_events: 1;
repeat_events: 1;
scale: 1;
description {
state: "default" 0.0;

7
ecdb/trunk/src/ecdb_gui.c
View File

@ -183,6 +183,7 @@ ecdb_create_main_gui(void)
Evas_Object *gui;
Evas_Coord mw, mh;
const char *scale;
float scalef;
/* This would be wonderful, but its a bit glitchy
em->main_win_ee = ecore_evas_gl_x11_new(0, 0, 0, 0, 255, 255);
@ -216,14 +217,16 @@ ecdb_create_main_gui(void)
/* Make this configurable at some point */
ecdb_set_main_theme(NULL);
scale = getenv("ECDB_SCALE");
if (scale)
edje_scale_set(atof(scale));
scalef = (scale) ? atof(scale) : 1.0;
edje_scale_set(scalef);
gui = edje_object_add(ecore_evas_get(em->main_win_ee));
edje_object_file_set(gui, em->theme_path, "ecdb/window");
edje_object_size_min_get(gui, &mw, &mh);
if (mw <= 0) mw = 400;
if (mh <= 0) mh = 300;
mw = (int)((float)mw * scalef);
mh = (int)((float)mh * scalef);
evas_object_resize(gui, mw, mh);
ecore_evas_resize(em->main_win_ee, mw, mh);
ecore_evas_size_min_set(em->main_win_ee, mw, mh);

3
ecdb/trunk/src/ecdb_widgets.c
View File

@ -889,7 +889,8 @@ ecdb_combo_expand(Evas_Object *c)
min_size = edje_object_data_get(o, "ecdb/combo_item/minh");
if (min_size)
{
h2 += atoi(min_size);
// FIXME Change this to config val
h2 += (int)(atof(min_size) * edje_scale_get());
}
else
{