Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c
Log Message:
Remove dialog slider border window (not used in any theme).
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -3 -r1.202 -r1.203
--- dialog.c 22 Jun 2008 13:34:42 -0000 1.202
+++ dialog.c 22 Jun 2008 13:38:19 -0000 1.203
@@ -51,23 +51,19 @@
int base_orig_w, base_orig_h;
int knob_orig_w, knob_orig_h;
- int border_orig_w, border_orig_h;
int base_x, base_y, base_w, base_h;
int knob_x, knob_y, knob_w, knob_h;
- int border_x, border_y, border_w, border_h;
int numeric_x, numeric_y, numeric_w, numeric_h;
ImageClass *ic_base;
ImageClass *ic_knob;
- ImageClass *ic_border;
char in_drag;
int wanted_val;
Win base_win;
Win knob_win;
- Win border_win;
} DItemSlider;
typedef struct {
@@ -777,16 +773,12 @@
di->item.slider.min_length = 64;
di->item.slider.ic_base = NULL;
di->item.slider.ic_knob = NULL;
- di->item.slider.ic_border = NULL;
di->item.slider.base_win = 0;
di->item.slider.knob_win = 0;
- di->item.slider.border_win = 0;
di->item.slider.base_orig_w = 10;
di->item.slider.base_orig_h = 10;
di->item.slider.knob_orig_w = 6;
di->item.slider.knob_orig_h = 6;
- di->item.slider.border_orig_w = 14;
- di->item.slider.border_orig_h = 14;
di->item.slider.base_x = 0;
di->item.slider.base_y = 0;
di->item.slider.base_w = 0;
@@ -795,10 +787,6 @@
di->item.slider.knob_y = 0;
di->item.slider.knob_w = 0;
di->item.slider.knob_h = 0;
- di->item.slider.border_x = 0;
- di->item.slider.border_y = 0;
- di->item.slider.border_w = 0;
- di->item.slider.border_h = 0;
di->item.slider.numeric_x = 0;
di->item.slider.numeric_y = 0;
di->item.slider.numeric_w = 0;
@@ -1073,26 +1061,6 @@
EImageFree(im);
}
- if (!di->item.slider.ic_border)
- {
- if (di->item.slider.horizontal)
- di->item.slider.ic_border =
- ImageclassAlloc("DIALOG_WIDGET_SLIDER_BORDER_HORIZONTAL", 1);
- else
- di->item.slider.ic_border =
- ImageclassAlloc("DIALOG_WIDGET_SLIDER_BORDER_VERTICAL", 1);
- }
- im = ImageclassGetImage(di->item.slider.ic_border, 0, 0, 0);
- if (im)
- {
- EImageGetSize(im, &di->item.slider.border_orig_w,
- &di->item.slider.border_orig_h);
- EImageFree(im);
- di->item.slider.border_win =
- ECreateWindow(d->win, -20, -20, 2, 2, 0);
- EMapWindow(di->item.slider.border_win);
- }
-
pad = ImageclassGetPadding(di->item.slider.ic_base);
if (di->item.slider.horizontal)
{
@@ -1393,10 +1361,6 @@
dii->item.slider.base_y = 0;
dii->item.slider.base_w = dii->w;
dii->item.slider.base_h = dii->h;
- dii->item.slider.border_x = 0;
- dii->item.slider.border_y = 0;
- dii->item.slider.border_w = dii->w;
- dii->item.slider.border_h = dii->h;
dii->item.slider.knob_w =
dii->item.slider.knob_orig_w;
dii->item.slider.knob_h =
@@ -1409,15 +1373,6 @@
dii->item.slider.base_y,
dii->item.slider.base_w,
dii->item.slider.base_h);
- if (dii->item.slider.border_win)
- EMoveResizeWindow(dii->item.slider.
- border_win,
- dii->x +
- dii->item.slider.border_x,
- dii->y +
- dii->item.slider.border_y,
- dii->item.slider.border_w,
- dii->item.slider.border_h);
if (dii->win)
EMoveResizeWindow(dii->win,
dii->x +
@@ -1508,12 +1463,6 @@
dii->y + dii->item.slider.knob_y,
dii->item.slider.knob_w,
dii->item.slider.knob_h);
- if (dii->item.slider.border_win)
- EMoveResizeWindow(dii->item.slider.border_win,
- dii->x + dii->item.slider.border_x,
- dii->y + dii->item.slider.border_y,
- dii->item.slider.border_w,
- dii->item.slider.border_h);
if (dii->win)
EMoveResizeWindow(dii->win,
dii->x + dii->item.slider.numeric_x,
@@ -1636,10 +1585,6 @@
ImageclassApply(di->item.slider.ic_base,
di->item.slider.base_win,
0, 0, STATE_NORMAL, ST_WIDGET);
- if (di->item.slider.border_win)
- ImageclassApply(di->item.slider.ic_border,
- di->item.slider.border_win,
- 0, 0, STATE_NORMAL, ST_WIDGET);
state = STATE_NORMAL;
if ((di->hilited) && (di->clicked))
state = STATE_CLICKED;
@@ -2031,12 +1976,10 @@
case DITEM_SLIDER:
ImageclassFree(di->item.slider.ic_base);
ImageclassFree(di->item.slider.ic_knob);
- ImageclassFree(di->item.slider.ic_border);
if (!clean)
break;
EDestroyWindow(di->item.slider.base_win);
EDestroyWindow(di->item.slider.knob_win);
- EDestroyWindow(di->item.slider.border_win);
break;
case DITEM_AREA:
if (!clean)
@@ -2233,11 +2176,6 @@
break;
case DITEM_SLIDER:
-#if 0 /* Do any themes have this? */
- if (win == di->item.slider.border_win)
- break;
-#endif
-
if (ev->xbutton.window == WinGetXwin(di->item.slider.knob_win))
{
if (ev->xbutton.button >= 1 && ev->xbutton.button <= 3)
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
