summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Houston <stephen@localhost.localdomain>2017-10-18 19:02:38 -0500
committerStephen Houston <stephen@localhost.localdomain>2017-10-18 19:02:38 -0500
commit503d8c4092d86e2380d326aa2f0123609805c28a (patch)
treefd9a0dcd1da50f2a2f80a627bd69b6f431485110
parent7deb3d8636e59a47269b104ef5a7a12ff9d52399 (diff)
Use the edje theme for the demo gadget and add a weight to the ctxpopup.
-rw-r--r--meson.build3
-rw-r--r--src/wireless.c1
-rw-r--r--wireless.desktop.in2
-rw-r--r--wireless.pngbin14127 -> 0 bytes
4 files changed, 2 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index dbb4808..a12c621 100644
--- a/meson.build
+++ b/meson.build
@@ -79,9 +79,6 @@ configure_file(input: 'wireless.desktop.in',
79 install_dir: join_paths([dir_gadgets, 'wireless']), 79 install_dir: join_paths([dir_gadgets, 'wireless']),
80 configuration: desktop_data) 80 configuration: desktop_data)
81 81
82install_data('wireless.png',
83 install_dir: join_paths(dir_data, 'icons'))
84
85configure_file(output: 'config.h', 82configure_file(output: 'config.h',
86 install: false, 83 install: false,
87 configuration: config_h) 84 configuration: config_h)
diff --git a/src/wireless.c b/src/wireless.c
index ad71cb3..2607ea9 100644
--- a/src/wireless.c
+++ b/src/wireless.c
@@ -1041,6 +1041,7 @@ _wireless_gadget_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Ob
1041 wireless_popup.items = eina_hash_pointer_new(NULL); 1041 wireless_popup.items = eina_hash_pointer_new(NULL);
1042 1042
1043 ctx = elm_win_add(inst->win, "win", ELM_WIN_POPUP_MENU); 1043 ctx = elm_win_add(inst->win, "win", ELM_WIN_POPUP_MENU);
1044 evas_object_size_hint_weight_set(ctx, .2, .33);
1044 1045
1045 tb = elm_table_add(ctx); 1046 tb = elm_table_add(ctx);
1046 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1047 evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
diff --git a/wireless.desktop.in b/wireless.desktop.in
index ec3d993..e65e70f 100644
--- a/wireless.desktop.in
+++ b/wireless.desktop.in
@@ -2,4 +2,4 @@
2Type=Application 2Type=Application
3Name=Wireless 3Name=Wireless
4Exec=@GADGET_DIR@/wireless/e_gadget_wireless 4Exec=@GADGET_DIR@/wireless/e_gadget_wireless
5Icon=@DATA_DIR@/icons/wireless.png 5Icon=wireless/wifi
diff --git a/wireless.png b/wireless.png
deleted file mode 100644
index 22f5165..0000000
--- a/wireless.png
+++ /dev/null
Binary files differ