Possibility to add popup menu to any widget.

This commit is contained in:
and3md 2018-02-18 15:52:09 +01:00
parent 2312c5aa2e
commit 0048cf482b
3 changed files with 30 additions and 11 deletions

View File

@ -849,13 +849,6 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
acceleratorMap.add([ACTION_EDITOR_FIND_NEXT, ACTION_EDITOR_FIND_PREV]); acceleratorMap.add([ACTION_EDITOR_FIND_NEXT, ACTION_EDITOR_FIND_PREV]);
} }
protected MenuItem _popupMenu;
@property MenuItem popupMenu() { return _popupMenu; }
@property EditWidgetBase popupMenu(MenuItem popupMenu) {
_popupMenu = popupMenu;
return this;
}
/// ///
override bool onMenuItemAction(const Action action) { override bool onMenuItemAction(const Action action) {
return dispatchAction(action); return dispatchAction(action);

View File

@ -1005,7 +1005,7 @@ class GridWidgetBase : ScrollWidgetBase, GridModelAdapter, MenuItemActionHandler
} }
/// handle popup menu action /// handle popup menu action
protected bool onMenuItemAction(const Action action) { protected override bool onMenuItemAction(const Action action) {
if (menuItemAction.assigned) if (menuItemAction.assigned)
return menuItemAction(action); return menuItemAction(action);
return false; return false;

View File

@ -41,6 +41,7 @@ public {
import dlangui.core.i18n; import dlangui.core.i18n;
import dlangui.core.collections; import dlangui.core.collections;
import dlangui.widgets.styles; import dlangui.widgets.styles;
import dlangui.widgets.menu;
import dlangui.graphics.drawbuf; import dlangui.graphics.drawbuf;
import dlangui.graphics.resources; import dlangui.graphics.resources;
@ -153,7 +154,7 @@ enum CursorType {
* *
*/ */
@dmlwidget @dmlwidget
class Widget { class Widget : MenuItemActionHandler {
protected: protected:
/// widget id /// widget id
string _id; string _id;
@ -1506,13 +1507,38 @@ public:
// =========================================================== // ===========================================================
// popup menu support // popup menu support
override bool onMenuItemAction(const Action action) {
return dispatchAction(action);
}
protected MenuItem _popupMenu;
@property MenuItem popupMenu() { return _popupMenu; }
@property Widget popupMenu(MenuItem popupMenu) {
_popupMenu = popupMenu;
return this;
}
/// returns true if widget can show popup menu (e.g. by mouse right click at point x,y) /// returns true if widget can show popup menu (e.g. by mouse right click at point x,y)
bool canShowPopupMenu(int x, int y) { bool canShowPopupMenu(int x, int y) {
return false; if (_popupMenu is null)
return false;
if (_popupMenu.openingSubmenu.assigned)
if (!_popupMenu.openingSubmenu(_popupMenu))
return false;
return true;
} }
/// shows popup menu at (x,y) /// shows popup menu at (x,y)
void showPopupMenu(int x, int y) { void showPopupMenu(int x, int y) {
// override to show popup /// if preparation signal handler assigned, call it; don't show popup if false is returned from handler
if (_popupMenu.openingSubmenu.assigned)
if (!_popupMenu.openingSubmenu(_popupMenu))
return;
_popupMenu.updateActionState(this);
import dlangui.widgets.popup;
PopupMenu popupMenu = new PopupMenu(_popupMenu);
popupMenu.menuItemAction = this;
PopupWidget popup = window.showPopup(popupMenu, this, PopupAlign.Point | PopupAlign.Right, x, y);
popup.flags = PopupFlags.CloseOnClickOutside;
} }
/// override to change popup menu items state /// override to change popup menu items state
bool isActionEnabled(const Action action) { bool isActionEnabled(const Action action) {