forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update actions - continue

This commit is contained in:
Vadim Lopatin 2015-01-31 08:03:58 +03:00
parent 055979b9e7
commit 9e0d20c814
3 changed files with 80 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dlangui/platforms/common/platform.d
View File

@ -233,8 +233,9 @@ class Window {
res.anchor.x = x; res.anchor.x = x;
res.anchor.y = y; res.anchor.y = y;
_popups ~= res; _popups ~= res;
if (_mainWidget !is null) if (_mainWidget !is null) {
_mainWidget.requestLayout(); _mainWidget.requestLayout();
}
return res; return res;
} }
/// remove popup /// remove popup
@ -403,7 +404,7 @@ class Window {
} }
_focusedWidget = newFocus; _focusedWidget = newFocus;
// after focus change, ask for actions update automatically // after focus change, ask for actions update automatically
requestActionsUpdate(); //requestActionsUpdate();
} }
return _focusedWidget; return _focusedWidget;
} }

49
src/dlangui/widgets/editors.d
View File

@ -387,14 +387,15 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
override bool isActionEnabled(const Action action) { override bool isActionEnabled(const Action action) {
switch (action.id) { switch (action.id) {
case EditorActions.Copy: case EditorActions.Copy:
case EditorActions.Cut:
return !_selectionRange.empty; return !_selectionRange.empty;
case EditorActions.Cut:
return enabled && !_selectionRange.empty;
case EditorActions.Paste: case EditorActions.Paste:
return Platform.instance.getClipboardText().length > 0; return enabled && Platform.instance.getClipboardText().length > 0;
case EditorActions.Undo: case EditorActions.Undo:
return _content.hasUndo; return enabled && _content.hasUndo;
case EditorActions.Redo: case EditorActions.Redo:
return _content.hasRedo; return enabled && _content.hasRedo;
default: default:
return super.isActionEnabled(action); return super.isActionEnabled(action);
} }
@ -406,14 +407,15 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
if (_popupMenu.onBeforeOpeningSubmenu.assigned) if (_popupMenu.onBeforeOpeningSubmenu.assigned)
if (!_popupMenu.onBeforeOpeningSubmenu(_popupMenu)) if (!_popupMenu.onBeforeOpeningSubmenu(_popupMenu))
return; return;
for (int i = 0; i < _popupMenu.subitemCount; i++) { _popupMenu.updateActionState(this);
MenuItem item = _popupMenu.subitem(i); //for (int i = 0; i < _popupMenu.subitemCount; i++) {
if (item.action && isActionEnabled(item.action)) { // MenuItem item = _popupMenu.subitem(i);
item.enabled = true; // if (item.action && isActionEnabled(item.action)) {
} else { // item.enabled = true;
item.enabled = false; // } else {
} // item.enabled = false;
} // }
//}
PopupMenu popupMenu = new PopupMenu(_popupMenu); PopupMenu popupMenu = new PopupMenu(_popupMenu);
popupMenu.onMenuItemActionListener = this; popupMenu.onMenuItemActionListener = this;
PopupWidget popup = window.showPopup(popupMenu, this, PopupAlign.Point | PopupAlign.Right, x, y); PopupWidget popup = window.showPopup(popupMenu, this, PopupAlign.Point | PopupAlign.Right, x, y);
@ -560,6 +562,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
ensureCaretVisible(); ensureCaretVisible();
correctCaretPos(); correctCaretPos();
requestLayout(); requestLayout();
requestActionsUpdate();
} else if (operation.action == EditAction.SaveContent) { } else if (operation.action == EditAction.SaveContent) {
// saved // saved
} else { } else {
@ -570,6 +573,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
updateMaxLineWidth(); updateMaxLineWidth();
measureVisibleText(); measureVisibleText();
ensureCaretVisible(); ensureCaretVisible();
requestActionsUpdate();
} }
} else { } else {
correctCaretPos(); correctCaretPos();
@ -580,6 +584,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
if (_lastReportedModifiedState != content.modified) { if (_lastReportedModifiedState != content.modified) {
_lastReportedModifiedState = content.modified; _lastReportedModifiedState = content.modified;
onModifiedStateChangeListener(this, content.modified); onModifiedStateChangeListener(this, content.modified);
requestActionsUpdate();
} }
} }
return; return;
@ -765,6 +770,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
_selectionRange.end = _caretPos; _selectionRange.end = _caretPos;
} }
invalidate(); invalidate();
requestActionsUpdate();
} }
protected void updateCaretPositionByMouse(int x, int y, bool selecting) { protected void updateCaretPositionByMouse(int x, int y, bool selecting) {
@ -815,6 +821,24 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
return true; return true;
} }
/// override to handle specific actions state (e.g. change enabled state for supported actions)
override bool handleActionStateRequest(const Action a) {
switch (a.id) {
case EditorActions.Copy:
case EditorActions.Cut:
case EditorActions.Paste:
case EditorActions.Undo:
case EditorActions.Redo:
if (isActionEnabled(a))
a.state = ACTION_STATE_ENABLED;
else
a.state = ACTION_STATE_DISABLE;
return true;
default:
return super.handleActionStateRequest(a);
}
}
override protected bool handleAction(const Action a) { override protected bool handleAction(const Action a) {
TextPosition oldCaretPos = _caretPos; TextPosition oldCaretPos = _caretPos;
dstring currentLine = _content[_caretPos.line]; dstring currentLine = _content[_caretPos.line];
@ -1084,6 +1108,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
_selectionRange.end = _content.lineEnd(_content.length - 1); _selectionRange.end = _content.lineEnd(_content.length - 1);
_caretPos = _selectionRange.end; _caretPos = _selectionRange.end;
ensureCaretVisible(); ensureCaretVisible();
requestActionsUpdate();
return true; return true;
default: default:
break; break;

40
src/dlangui/widgets/menu.d
View File

@ -229,6 +229,18 @@ class MenuItem {
/// prepare for opening of submenu, return true if opening is allowed /// prepare for opening of submenu, return true if opening is allowed
Signal!(bool, MenuItem) onBeforeOpeningSubmenu; Signal!(bool, MenuItem) onBeforeOpeningSubmenu;
/// call to update state for action (if action is assigned for widget)
void updateActionState(Widget w) {
if (_action) {
w.updateActionState(_action, true);
_enabled = _action.state.enabled;
_checked = _action.state.checked;
}
for (int i = 0; i < _subitems.length; i++) {
_subitems[i].updateActionState(w);
}
}
this() { this() {
_enabled = true; _enabled = true;
} }
@ -338,6 +350,16 @@ class MenuItemWidget : WidgetGroupDefaultDrawing {
resetState(State.Checked); resetState(State.Checked);
} }
///// call to update state for action (if action is assigned for widget)
//override void updateActionState(bool force = false) {
// if (!_item.action)
// return;
// super.updateActionState(_item._action, force);
// _item.enabled = _item._action.state.enabled;
// _item.checked = _item._action.state.checked;
// updateState();
//}
this(MenuItem item, bool mainMenu) { this(MenuItem item, bool mainMenu) {
id="menuitem"; id="menuitem";
_mainMenu = mainMenu; _mainMenu = mainMenu;
@ -421,6 +443,15 @@ class MenuWidgetBase : ListWidget {
return _orientation == Orientation.Horizontal; return _orientation == Orientation.Horizontal;
} }
/// call to update state for action (if action is assigned for widget)
override void updateActionState(bool force = false) {
for (int i = 0; i < itemCount; i++) {
MenuItemWidget w = cast(MenuItemWidget)itemWidget(i);
if (w)
w.updateActionState(force);
}
}
/// Measure widget according to desired width and height constraints. (Step 1 of two phase layout). /// Measure widget according to desired width and height constraints. (Step 1 of two phase layout).
override void measure(int parentWidth, int parentHeight) { override void measure(int parentWidth, int parentHeight) {
if (_orientation == Orientation.Horizontal) { if (_orientation == Orientation.Horizontal) {
@ -495,8 +526,10 @@ class MenuWidgetBase : ListWidget {
_openedPopup = null; _openedPopup = null;
} }
} }
PopupMenu popupMenu = new PopupMenu(itemWidget.item, this); PopupMenu popupMenu = new PopupMenu(itemWidget.item, this);
PopupWidget popup = window.showPopup(popupMenu, itemWidget, orientation == Orientation.Horizontal ? PopupAlign.Below : PopupAlign.Right); PopupWidget popup = window.showPopup(popupMenu, itemWidget, orientation == Orientation.Horizontal ? PopupAlign.Below : PopupAlign.Right);
requestActionsUpdate();
popup.onPopupCloseListener = &onPopupClosed; popup.onPopupCloseListener = &onPopupClosed;
popup.flags = PopupFlags.CloseOnClickOutside; popup.flags = PopupFlags.CloseOnClickOutside;
_openedPopup = popup; _openedPopup = popup;
@ -722,6 +755,13 @@ class MainMenu : MenuWidgetBase {
selectOnHover = false; selectOnHover = false;
} }
/// call to update state for action (if action is assigned for widget)
override void updateActionState(bool force) {
Log.d("MainMenu: updateActionState");
_item.updateActionState(this);
}
/// override and return true to track key events even when not focused /// override and return true to track key events even when not focused
@property override bool wantsKeyTracking() { @property override bool wantsKeyTracking() {
return true; return true;