From e3c87dd5f63e990650806dbffec0f519c8a8b28d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 18 Jan 2018 14:20:49 +0900 Subject: [PATCH] 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 --- src/lib/elementary/efl_ui_win.eo | 7 ++----- src/lib/elementary/elm_win_legacy.h | 7 ++++++- 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 b19016a..fc4c02f 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 dock, [[The window is used as a dock or panel. Usually would be kept on top of any other window by the Window Manager.]] toolbar, [[The window is used to hold a floating toolbar, or similar.]] - menu, [[Similar to #ELM_WIN_TOOLBAR.]] + menu, [[Similar to @.toolbar.]] utility, [[A persistent utility window, like a toolbox or palette.]] splash, [[Splash window for a starting up application.]] dropdown_menu, [[The window is a dropdown menu, as when an entry in a @@ -27,7 +27,7 @@ enum Efl.Ui.Win.Type This hint exists for completion only, as the EFL way of implementing a menu would not normally use a separate window for its contents.]] - popup_menu, [[Like #ELM_WIN_DROPDOWN_MENU, but for the menu triggered by + popup_menu, [[Like @.dropdown_menu, but for the menu triggered by right-clicking an object.]] tooltip, [[The window is a tooltip. A short piece of explanatory text that typically appear after the mouse cursor hovers over an object @@ -36,9 +36,6 @@ enum Efl.Ui.Win.Type a new E-Mail received.]] combo, [[A window holding the contents of a combo box. Not usually used in the EFL.]] - dnd, [[Used to indicate the window is a representation of an object being - dragged across different windows, or even applications. Typically - used with elm_win_override_set().]] /* Some types have been removed from EO. Skipping to 17. */ naviframe_basic = 17 [[Used for naviframe style replacement with a back 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 b061d62..1ca36f7 100644 --- a/src/lib/elementary/elm_win_legacy.h +++ b/src/lib/elementary/elm_win_legacy.h @@ -69,7 +69,12 @@ typedef Efl_Ui_Win_Type Elm_Win_Type; #define ELM_WIN_TOOLTIP EFL_UI_WIN_TOOLTIP #define ELM_WIN_NOTIFICATION EFL_UI_WIN_NOTIFICATION #define ELM_WIN_COMBO EFL_UI_WIN_COMBO -#define ELM_WIN_DND EFL_UI_WIN_DND +/** + * Used to indicate the window is a representation of an object being + * dragged across different windows, or even applications. Typically + * used with elm_win_override_set(). + */ +#define ELM_WIN_DND 13 #define ELM_WIN_INLINED_IMAGE 14 #define ELM_WIN_SOCKET_IMAGE 15 #define ELM_WIN_FAKE 16 /**< See elm_win_fake_add(). @since 1.13 */ -- 2.7.4