aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin/options.c
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2013-01-23 05:53:18 +0000
committerCarsten Haitzler <raster@rasterman.com>2013-01-23 05:53:18 +0000
commit097bf1a09def098547ffd2b55383102a28e4c1d4 (patch)
tree9f04fd6e6938f9d60e31ceca67e1d4ee12953ac3 /src/bin/options.c
parentterminology: just push a stupid micro optimization to just be below urxvt. (diff)
downloadterminology-097bf1a09def098547ffd2b55383102a28e4c1d4.tar.gz
options work agai - less purty. i need to adapt options now to
grid/pane-term. - they should be an overkay over all terms, not done inside per-term theme. split needed. SVN revision: 83124
Diffstat (limited to 'src/bin/options.c')
-rw-r--r--src/bin/options.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/bin/options.c b/src/bin/options.c
index 80b8019..e2f5fc6 100644
--- a/src/bin/options.c
+++ b/src/bin/options.c
@@ -127,14 +127,16 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
{
Evas_Object *o;
- saved_win = win;
- saved_bg = bg;
mode = -1;
if (!op_frame)
{
Elm_Object_Item *it_fn;
Config *config = termio_config_get(term);
-
+
+ if (!config) return;
+ saved_win = win;
+ saved_bg = bg;
+
op_opbox = o = elm_box_add(win);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -195,7 +197,12 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term)
evas_object_show(op_frame);
}
else if ((op_opbox) && (!op_out))
- edje_object_signal_emit(bg, "optdetails,show", "terminology");
+ {
+ edje_object_part_swallow(bg, "terminology.optdetails", op_opbox);
+ edje_object_part_swallow(bg, "terminology.options", op_frame);
+ edje_object_signal_emit(bg, "optdetails,show", "terminology");
+ edje_object_signal_emit(bg, "options,show", "terminology");
+ }
if (!op_out)
{