e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Tue Sep 14 10:53:14 PDT 1999 

(Raster)

fix menu segfault bug

fix raiswlower for groups :)

make "abotu this theme" brign up the ABOUT for the CURRENT theme :)


SVN revision: 268
This commit is contained in:
Carsten Haitzler 1999-09-14 17:36:48 +00:00
parent 54dca848dc
commit 1b0f48c1d4
5 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ChangeLog
View File

@ -1721,3 +1721,14 @@ they are switched in one of the groups dialogs. Apparently there's a bug
with imageclasses that use transparency, probably an Imlib issue.
-------------------------------------------------------------------------------
Tue Sep 14 10:53:14 PDT 1999
(Raster)
fix menu segfault bug
fix raiswlower for groups :)
make "abotu this theme" brign up the ABOUT for the CURRENT theme :)

35
src/actions.c
View File

@ -3382,7 +3382,8 @@ int
doRaiseLower(void *params)
{
EWin *ewin;
int i;
EWin **gwins;
int i, num, j;
EDBUG(6, "doRaiseLower");
if (InZoom())
@ -3395,26 +3396,34 @@ doRaiseLower(void *params)
ewin = GetFocusEwin();
if (!ewin)
EDBUG_RETURN(0);
if (desks.desk[ewin->desktop].list)
gwins = ListWinGroupMembersForEwin(ewin, ACTION_NONE, 0, &num);
for (j = 0; j < num; j++)
{
for (i = 0; i < desks.desk[ewin->desktop].num - 1; i++)
ewin = gwins[j];
if (desks.desk[ewin->desktop].list)
{
if (desks.desk[ewin->desktop].list[i]->layer == ewin->layer)
for (i = 0; i < desks.desk[ewin->desktop].num - 1; i++)
{
if (desks.desk[ewin->desktop].list[i] == ewin)
if (desks.desk[ewin->desktop].list[i]->layer == ewin->layer)
{
AUDIO_PLAY("SOUND_LOWER");
LowerEwin(ewin);
if (desks.desk[ewin->desktop].list[i] == ewin)
{
AUDIO_PLAY("SOUND_LOWER");
LowerEwin(ewin);
}
else
{
AUDIO_PLAY("SOUND_RAISE");
RaiseEwin(ewin);
}
i = desks.desk[ewin->desktop].num;
}
else
{
AUDIO_PLAY("SOUND_RAISE");
RaiseEwin(ewin);
}
break;
}
}
}
Efree(gwins);
EDBUG_RETURN(0);
}

3
src/evhandlers.c
View File

@ -1982,7 +1982,8 @@ HandleMouseUp(XEvent * ev)
{
if (ww == ewin->bits[i].win)
{
if (ewin->border->part[i].flags & FLAG_TITLE)
if ((ewin->border->part[i].flags & FLAG_TITLE) &&
(ewin->menu))
{
ewin->menu->stuck = 1;
mode.context_ewin = ewin;

2
src/main.c
View File

@ -164,7 +164,6 @@ main(int argc, char **argv)
/* SC_Init();
* SC_SetHotspot(30, 30);
* SC_SetWait(); */
SetupEnv();
InitDesktopBgs();
GotoDesktop(0);
CommsSetup();
@ -228,6 +227,7 @@ main(int argc, char **argv)
CreateStartupDisplay(0);
/* retreive stuff from last time we were loaded if we're restarting */
ICCCM_GetMainEInfo();
SetupEnv();
MapUnmap(1);
/* set some more stuff for gnome */
GNOME_SetCurrentArea();

4
src/themes/configs/menus.cfg
View File

@ -96,8 +96,8 @@ ADD_MENU_SUBMENU_TEXT_ITEM("Settings", "CONFIG_SUBMENU")
ADD_MENU_SUBMENU_TEXT_ITEM("Themes", "THEMES_SUBMENU")
ADD_MENU_SUBMENU_TEXT_ITEM("Test File Menu", "FILE_MENU")
ADD_MENU_TEXT_ITEM("About Enlightenment", __A_ABOUT, "")
ADD_MENU_TEXT_ITEM("Help", __A_EXEC, ENLIGHTENMENT_BIN"/dox" ENLIGHTENMENT_ROOT"/E-docs")
ADD_MENU_TEXT_ITEM("About this theme", __A_EXEC, ENLIGHTENMENT_BIN"/dox" ENLIGHTENMENT_THEME"/ABOUT")
ADD_MENU_TEXT_ITEM("Help", __A_EXEC, ENLIGHTENMENT_BIN"/dox" $EROOT"/E-docs")
ADD_MENU_TEXT_ITEM("About this theme", __A_EXEC, ENLIGHTENMENT_BIN"/dox" $ETHEME"/ABOUT")
ADD_MENU_TEXT_ITEM("Restart", __A_EXIT, "restart")
ADD_MENU_TEXT_ITEM("Log Out", __A_EXIT, "logout")
END_MENU