gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

fixed bug with menu editor in wprefs

Browse Source
This commit is contained in:
kojima
1999-05-16 00:30:07 +00:00
parent 23aac1a87a
commit da36a4ee96
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
WPrefs.app/Menu.c
View File

@@ -75,6 +75,7 @@ typedef struct _Panel {
char capturing; /* shortcut capture */ char capturing; /* shortcut capture */
char unsaved; /* if there are unsaved changes */ char unsaved; /* if there are unsaved changes */
char dontSave; char dontSave;
char scrolledBrowser;
} _Panel; } _Panel;
@@ -503,6 +504,7 @@ performCommand(WMWidget *w, void *data)
case CRemove: case CRemove:
if (row < 0) if (row < 0)
return; return;
panel->scrolledBrowser = 0;
WMRemoveBrowserItem(panel->browser, column, row); WMRemoveBrowserItem(panel->browser, column, row);
menuItem = PLGetArrayElement(menu, row+1); menuItem = PLGetArrayElement(menu, row+1);
if (strcmp(getItemCommand(menuItem), "WORKSPACE_MENU")==0) { if (strcmp(getItemCommand(menuItem), "WORKSPACE_MENU")==0) {
@@ -514,9 +516,11 @@ performCommand(WMWidget *w, void *data)
updateForItemType(panel, TNothing); updateForItemType(panel, TNothing);
panel->editedItem = NULL; panel->editedItem = NULL;
panel->unsaved = 1; panel->unsaved = 1;
if (pop == panel->cmd1P) {
if (pop == panel->cmd1P && !panel->scrolledBrowser) {
WMSetTextFieldText(panel->tit2T, NULL); WMSetTextFieldText(panel->tit2T, NULL);
} }
removed = True; removed = True;
return; return;
case CCut: case CCut:
@@ -1034,8 +1038,10 @@ scrolledBrowser(WMBrowserDelegate *self, WMBrowser *sender)
WMSetTextFieldText(panel->tit1T, getItemTitle(item)); WMSetTextFieldText(panel->tit1T, getItemTitle(item));
item = getSubmenuInColumn(panel, column + 1); item = getSubmenuInColumn(panel, column + 1);
if (item) if (item) {
WMSetTextFieldText(panel->tit2T, getItemTitle(item)); WMSetTextFieldText(panel->tit2T, getItemTitle(item));
}
panel->scrolledBrowser = 1;
} }