summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2018-01-18 14:20:49 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2018-01-18 14:20:49 +0900
commit934f23c9be2b1e4c7ddf7b5e3c6f40931941bc11 (patch)
tree0f2699d0de29178ceefdcc41b111ab31c051b5b1
parent50e0099cebf340399954ba39c5b19b4638e92bdf (diff)
win: Remove unusable type "dnd"
Override mode is not available in the unified api. That's because you can't do it in Wayland. I still think those types are stupid and should all die: Win subclasses handle them for you. Odd types can't be used anyway. Ref T5322
-rw-r--r--src/lib/elementary/efl_ui_win.eo7
-rw-r--r--src/lib/elementary/elm_win_legacy.h7
2 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 7d6f8560f3..462d38e070 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -19,7 +19,7 @@ enum Efl.Ui.Win.Type
19 dock, [[The window is used as a dock or panel. Usually would be kept on top 19 dock, [[The window is used as a dock or panel. Usually would be kept on top
20 of any other window by the Window Manager.]] 20 of any other window by the Window Manager.]]
21 toolbar, [[The window is used to hold a floating toolbar, or similar.]] 21 toolbar, [[The window is used to hold a floating toolbar, or similar.]]
22 menu, [[Similar to #ELM_WIN_TOOLBAR.]] 22 menu, [[Similar to @.toolbar.]]
23 utility, [[A persistent utility window, like a toolbox or palette.]] 23 utility, [[A persistent utility window, like a toolbox or palette.]]
24 splash, [[Splash window for a starting up application.]] 24 splash, [[Splash window for a starting up application.]]
25 dropdown_menu, [[The window is a dropdown menu, as when an entry in a 25 dropdown_menu, [[The window is a dropdown menu, as when an entry in a
@@ -27,7 +27,7 @@ enum Efl.Ui.Win.Type
27 This hint exists for completion only, as the EFL way of 27 This hint exists for completion only, as the EFL way of
28 implementing a menu would not normally use a separate 28 implementing a menu would not normally use a separate
29 window for its contents.]] 29 window for its contents.]]
30 popup_menu, [[Like #ELM_WIN_DROPDOWN_MENU, but for the menu triggered by 30 popup_menu, [[Like @.dropdown_menu, but for the menu triggered by
31 right-clicking an object.]] 31 right-clicking an object.]]
32 tooltip, [[The window is a tooltip. A short piece of explanatory text that 32 tooltip, [[The window is a tooltip. A short piece of explanatory text that
33 typically appear after the mouse cursor hovers over an object 33 typically appear after the mouse cursor hovers over an object
@@ -36,9 +36,6 @@ enum Efl.Ui.Win.Type
36 a new E-Mail received.]] 36 a new E-Mail received.]]
37 combo, [[A window holding the contents of a combo box. Not usually used in 37 combo, [[A window holding the contents of a combo box. Not usually used in
38 the EFL.]] 38 the EFL.]]
39 dnd, [[Used to indicate the window is a representation of an object being
40 dragged across different windows, or even applications. Typically
41 used with elm_win_override_set().]]
42 /* Some types have been removed from EO. Skipping to 17. */ 39 /* Some types have been removed from EO. Skipping to 17. */
43 naviframe_basic = 17 [[Used for naviframe style replacement with a back 40 naviframe_basic = 17 [[Used for naviframe style replacement with a back
44 button instead of a close button. 41 button instead of a close button.
diff --git a/src/lib/elementary/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h
index 1232015430..ef210528fc 100644
--- a/src/lib/elementary/elm_win_legacy.h
+++ b/src/lib/elementary/elm_win_legacy.h
@@ -66,7 +66,12 @@ typedef Efl_Ui_Win_Type Elm_Win_Type;
66#define ELM_WIN_TOOLTIP EFL_UI_WIN_TOOLTIP 66#define ELM_WIN_TOOLTIP EFL_UI_WIN_TOOLTIP
67#define ELM_WIN_NOTIFICATION EFL_UI_WIN_NOTIFICATION 67#define ELM_WIN_NOTIFICATION EFL_UI_WIN_NOTIFICATION
68#define ELM_WIN_COMBO EFL_UI_WIN_COMBO 68#define ELM_WIN_COMBO EFL_UI_WIN_COMBO
69#define ELM_WIN_DND EFL_UI_WIN_DND 69/**
70 * Used to indicate the window is a representation of an object being
71 * dragged across different windows, or even applications. Typically
72 * used with elm_win_override_set().
73 */
74#define ELM_WIN_DND 13
70#define ELM_WIN_INLINED_IMAGE 14 75#define ELM_WIN_INLINED_IMAGE 14
71#define ELM_WIN_SOCKET_IMAGE 15 76#define ELM_WIN_SOCKET_IMAGE 15
72#define ELM_WIN_FAKE 16 /**< See elm_win_fake_add(). @since 1.13 */ 77#define ELM_WIN_FAKE 16 /**< See elm_win_fake_add(). @since 1.13 */