summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-11-23 22:01:34 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-11-23 22:01:34 +0900
commit516691de9bd0fccd8ce1113de466862b4367141f (patch)
tree8ec9e09019e860c95202bd4fdd076d940b38f07d
parentb2b81f2cd49b65d9567e4bfe27fb173f8216d7bc (diff)
ecore-evas - fix focus skip flag to be one way
this fixes focus skip being set if someone else sets skip pager/taskbar. it's a one-way prop. if focus skip is set THEN skip pager/taskbar is set. not the other way.
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 81e6208890..d725663ca5 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -878,7 +878,7 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED, int type EINA_UNUSED
878 ee->prop.maximized = EINA_FALSE; 878 ee->prop.maximized = EINA_FALSE;
879 ee->prop.sticky = EINA_FALSE; 879 ee->prop.sticky = EINA_FALSE;
880 ee->prop.fullscreen = EINA_FALSE; 880 ee->prop.fullscreen = EINA_FALSE;
881 ee->prop.focus_skip = EINA_FALSE; 881// ee->prop.focus_skip = EINA_FALSE;
882 882
883 ecore_x_netwm_window_state_get(e->win, &state, &num); 883 ecore_x_netwm_window_state_get(e->win, &state, &num);
884 if (state) 884 if (state)
@@ -908,11 +908,9 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED, int type EINA_UNUSED
908 break; 908 break;
909 case ECORE_X_WINDOW_STATE_SKIP_TASKBAR: 909 case ECORE_X_WINDOW_STATE_SKIP_TASKBAR:
910 edata->state.skip_taskbar = 1; 910 edata->state.skip_taskbar = 1;
911 ee->prop.focus_skip = EINA_TRUE;
912 break; 911 break;
913 case ECORE_X_WINDOW_STATE_SKIP_PAGER: 912 case ECORE_X_WINDOW_STATE_SKIP_PAGER:
914 edata->state.skip_pager = 1; 913 edata->state.skip_pager = 1;
915 ee->prop.focus_skip = EINA_TRUE;
916 break; 914 break;
917 case ECORE_X_WINDOW_STATE_FULLSCREEN: 915 case ECORE_X_WINDOW_STATE_FULLSCREEN:
918 ee->prop.fullscreen = 1; 916 ee->prop.fullscreen = 1;
@@ -936,8 +934,8 @@ _ecore_evas_x_event_property_change(void *data EINA_UNUSED, int type EINA_UNUSED
936 (prev.x.maximized_v != edata->state.maximized_v) || 934 (prev.x.maximized_v != edata->state.maximized_v) ||
937 (prev.x.maximized_h != edata->state.maximized_h) || 935 (prev.x.maximized_h != edata->state.maximized_h) ||
938// (prev.x.shaded != edata->state.shaded) || 936// (prev.x.shaded != edata->state.shaded) ||
939// (prev.x.skip_taskbar != edata->state.skip_taskbar) || 937 (prev.x.skip_taskbar != edata->state.skip_taskbar) ||
940// (prev.x.skip_pager != edata->state.skip_pager) || 938 (prev.x.skip_pager != edata->state.skip_pager) ||
941 (prev.x.fullscreen != edata->state.fullscreen) || 939 (prev.x.fullscreen != edata->state.fullscreen) ||
942// (prev.x.above != edata->state.above) || 940// (prev.x.above != edata->state.above) ||
943// (prev.x.below != edata->state.below) || 941// (prev.x.below != edata->state.below) ||