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

added item copying to menu editor in wprefs

Browse Source
This commit is contained in:
kojima
2001-01-06 17:43:18 +00:00
parent c6c0954767
commit a7d22c48b4
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -3,6 +3,7 @@ Changes since version 0.63.0:
- fixed compile prob with SGI compiler
- decreased nice() value in wmsetbg
- applied gnome panel not-covering patch from (Bastien Nocera <hadess@hadess.net>)
- added item copy to WPrefs menu editor
Changes since version 0.62.1:
.............................

1
WPrefs.app/Menu.c
View File

@@ -850,6 +850,7 @@ createPanel(_Panel *p)
" - drag items from the left to the menu to add new items\n"
" - drag items out of the menu to remove items\n"
" - drag items in menu to change their position\n"
" - drag items with Control pressed to copy them\n"
" - double click in a menu item to change the label\n"
" - click on a menu item to change related information"));
WMMapWidget(label);

16
WPrefs.app/editmenu.c
View File

@@ -1334,7 +1334,7 @@ duplicateMenu(WEditMenu *menu)
static void
dragItem(WEditMenu *menu, WEditMenuItem *item)
dragItem(WEditMenu *menu, WEditMenuItem *item, Bool copy)
{
static XColor black = {0, 0,0,0, DoRed|DoGreen|DoBlue};
static XColor green = {0x0045b045, 0x4500,0xb000,0x4500, DoRed|DoGreen|DoBlue};
@@ -1377,7 +1377,7 @@ dragItem(WEditMenu *menu, WEditMenuItem *item)
W_MoveView(dview, orix, oriy);
W_RealizeView(dview);
if (menu->flags.isFactory) {
if (menu->flags.isFactory || copy) {
dritem = duplicateItem(item);
W_ReparentView(dritem->view, dview, 0, 0);
@@ -1449,7 +1449,7 @@ dragItem(WEditMenu *menu, WEditMenuItem *item)
if (!enteredMenu) {
Bool rem = True;
if (!menu->flags.isFactory) {
if (!menu->flags.isFactory && !copy) {
W_UnmapView(dview);
if (menu->delegate && menu->delegate->shouldRemoveItem) {
rem = (*menu->delegate->shouldRemoveItem)(menu->delegate,
@@ -1458,10 +1458,10 @@ dragItem(WEditMenu *menu, WEditMenuItem *item)
W_MapView(dview);
}
if (!rem || menu->flags.isFactory) {
if (!rem || menu->flags.isFactory || copy) {
slideWindow(dpy, W_VIEW_DRAWABLE(dview), x-dx, y-dy, orix, oriy);
if (!menu->flags.isFactory) {
if (!menu->flags.isFactory && !copy) {
WRemoveEditMenuItem(menu, dritem);
handleItemDrop(dmenu ? dmenu : menu, dritem, orix, oriy);
}
@@ -1472,14 +1472,14 @@ dragItem(WEditMenu *menu, WEditMenuItem *item)
WRemoveEditMenuItem(menu, dritem);
if (menu->delegate && menu->delegate->itemCloned
&& menu->flags.isFactory) {
&& (menu->flags.isFactory || copy)) {
(*menu->delegate->itemCloned)(menu->delegate, menu,
item, dritem);
}
handleItemDrop(dmenu, dritem, x-dy, y-dy);
if (item->submenu && menu->flags.isFactory) {
if (item->submenu && (menu->flags.isFactory || copy)) {
WEditMenu *submenu;
submenu = duplicateMenu(item->submenu);
@@ -1524,7 +1524,7 @@ handleItemClick(XEvent *event, void *data)
if (abs(event->xbutton.x_root - menu->dragX) > 5
|| abs(event->xbutton.y_root - menu->dragY) > 5) {
menu->flags.isDragging = 0;
dragItem(menu, item);
dragItem(menu, item, event->xbutton.state & ControlMask);
}
}
break;