Kim, I actually had a patch fixing some of your last suggestions but
I didn't have enough time to send it out. Nonetheless, I quickly
made a new one minus changes you committed earlier.
This patch applies to this evenings CVS pull.
I have removed a number of options in the settings dialog
regarding Selective Transparency. One or two older options
might return once some bugs are squashed.
I have also started working on fixing a bug where the menus
images become corrupted when sliding onscreen. Currently,
I feel what I have done is a quick hack to help guide me
to possible areas where a better solution may exist. Also,
for some reason, the last Menu in the array is not properly
updated...
The problems with themes whose menus have full images to
identify directories such as Winter still exist. The bug
is hardly noticable on the desktop at the moment, but as
soon as you test out Glass transparency, it'll show.
Jaron Omega
[EMAIL PROTECTED]
--------------------------CUT HERE-------------------------
diff -ur e16/e/src/E.h e16.st/e/src/E.h
--- e16/e/src/E.h 2004-06-18 13:12:06.000000000 -0700
+++ e16.st/e/src/E.h 2004-06-18 20:56:55.000000000 -0700
@@ -2335,7 +2335,6 @@
void ImageStatePopulate(ImageState * is);
void ImageStateRealize(ImageState * is);
void IclassPopulate(ImageClass * iclass);
-int IclassIsTransparent(ImageClass * iclass);
void IclassApply(ImageClass * iclass, Window win, int w, int h,
int active, int sticky, int state, char expose,
int image_type);
@@ -2402,6 +2401,7 @@
/* menus.c */
void MenusInit(void);
void MenusHide(void);
+void MenuRedraw(Menu * m);
MenuStyle *MenuStyleCreate(void);
Menu *MenuCreate(const char *name);
void MenuDestroy(Menu * m);
diff -ur e16/e/src/borders.c e16.st/e/src/borders.c
--- e16/e/src/borders.c 2004-06-18 13:12:07.000000000 -0700
+++ e16.st/e/src/borders.c 2004-06-18 21:37:54.000000000 -0700
@@ -234,6 +234,12 @@
}
DrawEwinShape(ewin, Conf.slidemode, x, y, ewin->client.w, ewin->client.h, 2);
MoveEwin(ewin, tx, ty);
+ if(ewin->menu) {
+ HideEwin(ewin);
+ MenuRealize(ewin->menu);
+ MenuRedraw(ewin->menu);
+ ShowEwin(ewin);
+ }
Mode.doingslide = 0;
if (Conf.slidemode > 0)
UngrabX();
@@ -310,6 +316,12 @@
DrawEwinShape(ewin[i], 0, x[i], y[i], ewin[i]->client.w,
ewin[i]->client.h, 2);
MoveEwin(ewin[i], tx[i], ty[i]);
+ if(ewin[i]->menu) {
+ HideEwin(ewin[i]);
+ MenuRealize(ewin[i]->menu);
+ MenuRedraw(ewin[i]->menu);
+ ShowEwin(ewin[i]);
+ }
}
}
diff -ur e16/e/src/dialog.c e16.st/e/src/dialog.c
--- e16/e/src/dialog.c 2004-06-03 11:04:44.000000000 -0700
+++ e16.st/e/src/dialog.c 2004-06-18 20:56:33.000000000 -0700
@@ -574,7 +574,7 @@
if (!d)
return;
- if (Conf.theme.transparency || IclassIsTransparent(d->iclass))
+ if (Conf.theme.transparency)
DialogRedraw(d);
return;
resize = 0;
diff -ur e16/e/src/iclass.c e16.st/e/src/iclass.c
--- e16/e/src/iclass.c 2004-06-18 15:21:35.000000000 -0700
+++ e16.st/e/src/iclass.c 2004-06-18 20:57:07.000000000 -0700
@@ -329,12 +329,6 @@
EDBUG_RETURN_;
}
-int
-IclassIsTransparent(ImageClass * ic)
-{
- return ic && ic->norm.normal && ic->norm.normal->transparent;
-}
-
static ImageState *
IclassGetImageState1(ImageStateArray * pisa, int state)
{
diff -ur e16/e/src/menus.c e16.st/e/src/menus.c
--- e16/e/src/menus.c 2004-06-13 15:37:22.000000000 -0700
+++ e16.st/e/src/menus.c 2004-06-18 21:28:33.000000000 -0700
@@ -30,7 +30,6 @@
ButtonPressMask | ButtonReleaseMask | \
EnterWindowMask | LeaveWindowMask | PointerMotionMask
-static void MenuRedraw(Menu * m);
static void MenuActivateItem(Menu * m, MenuItem * mi);
static void MenuDrawItem(Menu * m, MenuItem * mi, char shape);
@@ -165,6 +164,7 @@
if ((!m->style->use_item_bg && m->pmm.pmap == 0) || m->redraw)
MenuRedraw(m);
+
}
static void
@@ -554,8 +554,8 @@
EDBUG(5, "MenuRepack");
- m->redraw = (Conf.theme.transparency ||
- IclassIsTransparent(m->style->bg_iclass)) ? 1 : -1;
+ m->redraw = (Conf.st_trans.menu != ICLASS_ATTR_OPAQUE);
+
if (m->win)
MenuRealize(m);
@@ -810,15 +810,15 @@
mmh += m->style->bg_iclass->padding.bottom;
}
- m->redraw = (Conf.theme.transparency ||
- IclassIsTransparent(m->style->bg_iclass)) ? 1 : -1;
+ m->redraw = (Conf.st_trans.menu != ICLASS_ATTR_OPAQUE);
+
EResizeWindow(disp, m->win, mmw, mmh);
Mode.queue_up = pq;
EDBUG_RETURN_;
}
-static void
+/* static */void
MenuRedraw(Menu * m)
{
int i, w, h;
@@ -882,14 +882,23 @@
{
PmapMask pmm;
- if (mi->child)
+ if (mi->child && (mi->state != STATE_NORMAL)) {
IclassApplyCopy(m->style->sub_iclass, mi->win, w, h,
0, 0, mi->state, &pmm, 1,
+ ST_HILIGHT);
+ } else if (mi->child && (mi->state == STATE_NORMAL)) {
+ IclassApplyCopy(m->style->sub_iclass, mi->win, w,
+ h, 0, 0, mi->state, &pmm, 1,
ST_MENU_ITEM);
- else
+ } else if (mi->state != STATE_NORMAL) {
+ IclassApplyCopy(m->style->item_iclass, mi->win, w,
+ h, 0, 0, mi->state, &pmm, 1,
+ ST_HILIGHT);
+ } else {
IclassApplyCopy(m->style->item_iclass, mi->win, w,
h, 0, 0, mi->state, &pmm, 1,
ST_MENU_ITEM);
+ }
if (pmm.mask)
{
XSetClipMask(disp, gc, pmm.mask);
@@ -899,7 +908,7 @@
0, 0);
FreePmapMask(&pmm);
}
- XFreeGC(disp, gc);
+ XFreeGC(disp, gc);
}
else
{
@@ -2037,8 +2046,9 @@
{
Mode.cur_menu_mode = 1;
XUngrabPointer(disp, CurrentTime);
- if (!FindEwinByMenu(m)) /* Don't show if already shown */
+ if (!FindEwinByMenu(m)) { /* Don't show if already shown */
MenuShow(m, 0);
+ }
Mode.cur_menu[0] = m;
Mode.cur_menu_depth = 1;
MenuShowMasker(m);
@@ -2771,6 +2781,7 @@
if (mi == NULL)
goto done;
+
if ((win == mi->icon_win) && (ev->xcrossing.detail == NotifyAncestor))
goto done;
if ((win == mi->win) && (ev->xcrossing.detail == NotifyInferior))
diff -ur e16/e/src/settings.c e16.st/e/src/settings.c
--- e16/e/src/settings.c 2004-06-14 10:02:30.000000000 -0700
+++ e16.st/e/src/settings.c 2004-06-18 20:42:57.000000000 -0700
@@ -2446,13 +2446,8 @@
static int tmp_st_border;
static int tmp_st_widget;
static int tmp_st_menu;
-static int tmp_st_menu_item;
static int tmp_st_tooltip;
-static int tmp_st_dialog;
static int tmp_st_hilight;
-static int tmp_st_pager;
-static int tmp_st_iconbox;
-static int tmp_st_warplist;
static void BG_RedrawView(char nuke_old);
@@ -2471,13 +2466,27 @@
Conf.st_trans.border = tmp_st_border;
Conf.st_trans.widget = tmp_st_widget;
Conf.st_trans.menu = tmp_st_menu;
- Conf.st_trans.menu_item = tmp_st_menu_item;
Conf.st_trans.tooltip = tmp_st_tooltip;
- Conf.st_trans.dialog = tmp_st_dialog;
- Conf.st_trans.hilight = tmp_st_hilight;
- Conf.st_trans.pager = tmp_st_pager;
- Conf.st_trans.iconbox = tmp_st_iconbox;
- Conf.st_trans.warplist = tmp_st_warplist;
+
+ Conf.st_trans.dialog = ICLASS_ATTR_BG;
+
+ if(tmp_st_hilight == ICLASS_ATTR_GLASS) {
+ Conf.st_trans.hilight = tmp_st_hilight;
+ Conf.st_trans.menu_item = ICLASS_ATTR_BG;
+
+ } else if(tmp_st_hilight == ICLASS_ATTR_BG) {
+ Conf.st_trans.hilight = tmp_st_hilight;
+ Conf.st_trans.menu_item = ICLASS_ATTR_BG;
+
+ } else if(tmp_st_hilight == ICLASS_ATTR_OPAQUE) {
+ Conf.st_trans.hilight = tmp_st_hilight;
+ Conf.st_trans.menu_item = ICLASS_ATTR_OPAQUE;
+
+ }
+
+ Conf.st_trans.pager = ICLASS_ATTR_BG;
+ Conf.st_trans.iconbox = ICLASS_ATTR_BG;
+ Conf.st_trans.warplist = ICLASS_ATTR_BG;
TransparencySet(tmp_theme_transparency);
#endif
@@ -3186,11 +3195,9 @@
{
Dialog *d;
- /* Dialog *dexp; */
DItem *table, *di;
- DItem *radio_border, *radio_widget, *radio_iconbox,
- *radio_menu, *radio_menu_item, *radio_tooltip,
- *radio_dialog, *radio_hilight, *radio_pager, *radio_warplist;
+ DItem *radio_border, *radio_widget, *radio_menu,
+ *radio_tooltip, *radio_hilight;
if ((d =
FindItem("CONFIGURE_SELECTIVETRANSPARENCY", 0, LIST_FINDBY_NAME,
@@ -3204,25 +3211,20 @@
tmp_st_border = Conf.st_trans.border;
tmp_st_widget = Conf.st_trans.widget;
- tmp_st_iconbox = Conf.st_trans.iconbox;
tmp_st_menu = Conf.st_trans.menu;
- tmp_st_menu_item = Conf.st_trans.menu_item;
tmp_st_tooltip = Conf.st_trans.tooltip;
- tmp_st_dialog = Conf.st_trans.dialog;
tmp_st_hilight = Conf.st_trans.hilight;
- tmp_st_pager = Conf.st_trans.pager;
- tmp_st_warplist = Conf.st_trans.warplist;
d = DialogCreate("CONFIGURE_SELECTIVETRANSPARENCY");
DialogSetTitle(d, _("Selective Transparency Settings"));
table = DialogInitItem(d);
- DialogItemTableSetOptions(table, 11, 0, 0, 0);
+ DialogItemTableSetOptions(table, 6, 0, 0, 0);
if (Conf.dialogs.headers)
{
di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetColSpan(di, 12);
+ DialogItemSetColSpan(di, 6);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemTextSetText(di,
@@ -3230,323 +3232,178 @@
"Settings Dialog\n"));
di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 12);
+ DialogItemSetColSpan(di, 6);
DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
}
di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetColSpan(di, 12);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetColSpan(di, 6);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Changes Might Require Restart:"));
di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 12);
- DialogItemSetPadding(di, 2, 2, 2, 10);
+ DialogItemSetColSpan(di, 6);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
di = DialogAddItem(table, DITEM_NONE);
DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 10, 2, 2);
DialogItemSetFill(di, 1, 0);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Borders:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Menus:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemTextSetText(di, _("Menu Items:"));
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Hilights:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemTextSetText(di, _("Dialog:"));
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("E Widgets:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSetAlign(di, 0, 512);
DialogItemTextSetText(di, _("Tooltips:"));
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemTextSetText(di, _("Pager:"));
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemTextSetText(di, _("Warplist:"));
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemTextSetText(di, _("Iconbox:"));
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
- DialogItemSetAlign(di, 0, 512);
+ DialogItemSetAlign(di, 0, 1024);
DialogItemTextSetText(di, _("Opaque"));
radio_border = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_border);
DialogItemRadioButtonGroupSetVal(di, 0);
radio_menu = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_menu);
DialogItemRadioButtonGroupSetVal(di, 0);
- radio_menu_item = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_menu_item);
- DialogItemRadioButtonGroupSetVal(di, 0);
-
radio_hilight = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_hilight);
DialogItemRadioButtonGroupSetVal(di, 0);
- radio_dialog = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_dialog);
- DialogItemRadioButtonGroupSetVal(di, 0);
-
radio_widget = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_widget);
DialogItemRadioButtonGroupSetVal(di, 0);
radio_tooltip = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_tooltip);
DialogItemRadioButtonGroupSetVal(di, 0);
- radio_pager = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_pager);
- DialogItemRadioButtonGroupSetVal(di, 0);
-
- radio_warplist = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_warplist);
- DialogItemRadioButtonGroupSetVal(di, 0);
-
- radio_iconbox = di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_iconbox);
- DialogItemRadioButtonGroupSetVal(di, 0);
-
- di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 12);
- DialogItemSetPadding(di, 2, 2, 4, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemSeparatorSetOrientation(di, 0);
-
- di = DialogAddItem(table, DITEM_TEXT);
- DialogItemSetColSpan(di, 12);
- DialogItemSetPadding(di, 2, 2, 8, 8);
- DialogItemSetFill(di, 1, 0);
- DialogItemSetAlign(di, 0, 512);
- DialogItemTextSetText(di, _("Transparency Style:"));
-
- di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 12);
- DialogItemSetPadding(di, 2, 2, 2, 4);
- DialogItemSetFill(di, 1, 0);
- DialogItemSeparatorSetOrientation(di, 0);
-
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
- DialogItemSetAlign(di, 0, 512);
+ DialogItemSetAlign(di, 0, 1024);
DialogItemTextSetText(di, _("Background"));
di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_border);
DialogItemRadioButtonGroupSetVal(di, 1);
DialogItemRadioButtonGroupSetValPtr(radio_border, &tmp_st_border);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_menu);
DialogItemRadioButtonGroupSetVal(di, 1);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_menu_item);
- DialogItemRadioButtonGroupSetVal(di, 1);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_hilight);
DialogItemRadioButtonGroupSetVal(di, 1);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_dialog);
- DialogItemRadioButtonGroupSetVal(di, 1);
- DialogItemRadioButtonGroupSetValPtr(radio_dialog, &tmp_st_dialog);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_widget);
DialogItemRadioButtonGroupSetVal(di, 1);
DialogItemRadioButtonGroupSetValPtr(radio_widget, &tmp_st_widget);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_tooltip);
DialogItemRadioButtonGroupSetVal(di, 1);
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_pager);
- DialogItemRadioButtonGroupSetVal(di, 1);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_warplist);
- DialogItemRadioButtonGroupSetVal(di, 1);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_iconbox);
- DialogItemRadioButtonGroupSetVal(di, 1);
- DialogItemRadioButtonGroupSetValPtr(radio_iconbox, &tmp_st_iconbox);
-
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetColSpan(di, 1);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0);
- DialogItemSetAlign(di, 0, 512);
+ DialogItemSetAlign(di, 0, 1024);
DialogItemTextSetText(di, _("Glass"));
di = DialogAddItem(table, DITEM_NONE);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_menu);
DialogItemRadioButtonGroupSetVal(di, 2);
DialogItemRadioButtonGroupSetValPtr(radio_menu, &tmp_st_menu);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_menu_item);
- DialogItemRadioButtonGroupSetVal(di, 2);
- DialogItemRadioButtonGroupSetValPtr(radio_menu_item, &tmp_st_menu_item);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_hilight);
DialogItemRadioButtonGroupSetVal(di, 2);
DialogItemRadioButtonGroupSetValPtr(radio_hilight, &tmp_st_hilight);
di = DialogAddItem(table, DITEM_NONE);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
-
- di = DialogAddItem(table, DITEM_NONE);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
+ DialogItemSetPadding(di, 2, 15, 2, 2);
DialogItemSetFill(di, 1, 0);
DialogItemRadioButtonSetFirst(di, radio_tooltip);
DialogItemRadioButtonGroupSetVal(di, 2);
DialogItemRadioButtonGroupSetValPtr(radio_tooltip, &tmp_st_tooltip);
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_pager);
- DialogItemRadioButtonGroupSetVal(di, 2);
- DialogItemRadioButtonGroupSetValPtr(radio_pager, &tmp_st_pager);
-
- di = DialogAddItem(table, DITEM_RADIOBUTTON);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
- DialogItemRadioButtonSetFirst(di, radio_warplist);
- DialogItemRadioButtonGroupSetVal(di, 2);
- DialogItemRadioButtonGroupSetValPtr(radio_warplist, &tmp_st_warplist);
-
- di = DialogAddItem(table, DITEM_NONE);
- DialogItemSetPadding(di, 2, 20, 2, 2);
- DialogItemSetFill(di, 1, 0);
-
di = DialogAddItem(table, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, 12);
+ DialogItemSetColSpan(di, 6);
DialogItemSetPadding(di, 2, 2, 4, 2);
DialogItemSetFill(di, 1, 0);
DialogItemSeparatorSetOrientation(di, 0);
@@ -3597,14 +3454,9 @@
#ifdef USE_IMLIB2
tmp_st_border = Conf.st_trans.border;
tmp_st_widget = Conf.st_trans.widget;
- tmp_st_iconbox = Conf.st_trans.iconbox;
tmp_st_menu = Conf.st_trans.menu;
- tmp_st_menu_item = Conf.st_trans.menu_item;
tmp_st_tooltip = Conf.st_trans.tooltip;
- tmp_st_dialog = Conf.st_trans.dialog;
tmp_st_hilight = Conf.st_trans.hilight;
- tmp_st_pager = Conf.st_trans.pager;
- tmp_st_warplist = Conf.st_trans.warplist;
#endif
d = bg_sel_dialog = DialogCreate("CONFIGURE_BG");
-------------------------------------------------------
This SF.Net email is sponsored by The 2004 JavaOne(SM) Conference
Learn from the experts at JavaOne(SM), Sun's Worldwide Java Developer
Conference, June 28 - July 1 at the Moscone Center in San Francisco, CA
REGISTER AND SAVE! http://java.sun.com/javaone/sf Priority Code NWMGYKND
_______________________________________________
enlightenment-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
