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

Fix various icon display mode issues. 

SVN revision: 43640
This commit is contained in:
Kim Woelders 2009-11-12 20:48:26 +00:00
parent fb5e484683
commit 6f08eafb63
4 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/container.c
View File

@ -1452,7 +1452,7 @@ typedef struct {
int side;
int arrows;
int iconsize;
int mode;
int icon_mode;
char auto_resize;
char draw_icon_base;
char scrollbar_hide;
@ -1480,7 +1480,7 @@ CB_ConfigureContainer(Dialog * d, int val, void *data __UNUSED__)
ct->scrollbar_side = dd->side;
ct->arrow_side = dd->arrows;
ct->iconsize = dd->iconsize;
ct->icon_mode = dd->mode;
ct->icon_mode = dd->icon_mode;
ct->auto_resize = dd->auto_resize;
ct->draw_icon_base = dd->draw_icon_base;
ct->scrollbar_hide = dd->scrollbar_hide;
@ -1526,7 +1526,7 @@ _DlgFillContainer(Dialog * d, DItem * table, void *data)
dd->side = ct->scrollbar_side;
dd->arrows = ct->arrow_side;
dd->iconsize = ct->iconsize;
dd->mode = ct->icon_mode;
dd->icon_mode = ct->icon_mode;
dd->auto_resize = ct->auto_resize;
dd->draw_icon_base = ct->draw_icon_base;
dd->scrollbar_hide = ct->scrollbar_hide;
@ -1693,7 +1693,7 @@ _DlgFillContainer(Dialog * d, DItem * table, void *data)
DialogItemSetText(di, _("Use Enlightenment Icon, Snapshot Window"));
DialogItemRadioButtonSetFirst(di, radio4);
DialogItemRadioButtonGroupSetVal(di, 2);
DialogItemRadioButtonGroupSetValPtr(radio4, &dd->mode);
DialogItemRadioButtonGroupSetValPtr(radio4, &dd->icon_mode);
}
}
@ -1764,7 +1764,7 @@ ContainersConfigLoad(void)
case CONFIG_ICON_SIZE: /* __ICON_SIZE %i */
ct->iconsize = i2;
break;
case CONFIG_ICON_MODE: /* __ICON_MODE [ 0 | 1 | 2 | 3 | 4 ] */
case CONFIG_ICON_MODE: /* __ICON_MODE [ 0 | 1 | 2 ] */
ct->icon_mode = i2;
break;
case CONFIG_SCROLLBAR_SIDE: /* __SCROLLBAR_SIDE [ __BAR_LEFT/__BAR_TOP | __BAR_RIGHT/__BAR_BOTTOM ] */

4
src/focus.c
View File

@ -873,13 +873,13 @@ _DlgFillFocus(Dialog * d, DItem * table, void *data __UNUSED__)
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("First E Icon, then App Icon"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 3);
DialogItemRadioButtonGroupSetVal(di, 2);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);
DialogItemSetText(di, _("First App Icon, then E Icon"));
DialogItemRadioButtonSetFirst(di, radio2);
DialogItemRadioButtonGroupSetVal(di, 4);
DialogItemRadioButtonGroupSetVal(di, 1);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
DialogItemSetColSpan(di, 2);

17
src/icons.c
View File

@ -222,19 +222,12 @@ IB_GetFallbackIcon(EWin * ewin, int size)
return im;
}
#define N_MODES 5
#define N_TYPES 4
#define N_MODES 3
#define N_TYPES 3
static const char ewin_icon_modes[N_MODES][N_TYPES] = {
{EWIN_ICON_TYPE_SNAP, EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG,
EWIN_ICON_TYPE_FB},
{EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_SNAP,
EWIN_ICON_TYPE_FB},
{EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_SNAP, EWIN_ICON_TYPE_APP,
EWIN_ICON_TYPE_FB},
{EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_FB,
EWIN_ICON_TYPE_NONE},
{EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_FB,
EWIN_ICON_TYPE_NONE},
{EWIN_ICON_TYPE_SNAP, EWIN_ICON_TYPE_FB, EWIN_ICON_TYPE_NONE},
{EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_FB},
{EWIN_ICON_TYPE_IMG, EWIN_ICON_TYPE_APP, EWIN_ICON_TYPE_FB},
};
EImage *

4
src/warp.c
View File

@ -480,7 +480,7 @@ WarpFocusHandleEvent(Win win __UNUSED__, XEvent * ev, void *prm __UNUSED__)
static void
WarplistCfgValidate(void)
{
static const char fix_mode[8] = { 0, 3, 3, 3, 4, 3, 3, 3 };
static const char fix_mode[8] = { 0, 1, 2, 2, 1, 2, 2, 2 };
Conf.warplist.icon_mode = fix_mode[Conf.warplist.icon_mode & 0x7];
}
@ -505,7 +505,7 @@ static const CfgItem WarplistCfgItems[] = {
CFG_ITEM_BOOL(Conf.warplist, warpfocused, 1),
CFG_ITEM_BOOL(Conf.warplist, raise_on_select, 1),
CFG_ITEM_BOOL(Conf.warplist, warp_on_select, 0),
CFG_ITEM_INT(Conf.warplist, icon_mode, 3),
CFG_ITEM_INT(Conf.warplist, icon_mode, 2),
};
#define N_CFG_ITEMS (sizeof(WarplistCfgItems)/sizeof(CfgItem))