author | dominik |
Fri, 21 Jan 2005 18:36:17 +0000 | |
changeset 1081 | 0d79fc43fae2 |
parent 915 | d845fe7cf6f2 |
child 1095 | b59632d9df1b |
permissions | -rw-r--r-- |
0 | 1 |
#include "stdafx.h" |
2 |
#include "ttd.h" |
|
507
04b5403aaf6b
(svn r815) Include strings.h only in the files which need it.
tron
parents:
193
diff
changeset
|
3 |
#include "table/strings.h" |
0 | 4 |
#include "window.h" |
5 |
#include "gfx.h" |
|
6 |
#include "viewport.h" |
|
7 |
||
8 |
static Point HandleScrollbarHittest(Scrollbar *sb, int top, int bottom) |
|
9 |
{ |
|
10 |
Point pt; |
|
11 |
int height, count, pos, cap; |
|
12 |
||
13 |
top += 10; |
|
14 |
bottom -= 9; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
15 |
|
0 | 16 |
height = (bottom - top); |
17 |
||
18 |
pos = sb->pos; |
|
19 |
count = sb->count; |
|
20 |
cap = sb->cap; |
|
21 |
||
22 |
if (count != 0) top += height * pos / count; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
23 |
|
0 | 24 |
if (cap > count) cap = count; |
25 |
if (count != 0) |
|
26 |
bottom -= (count - pos - cap) * height / count; |
|
27 |
||
28 |
pt.x = top; |
|
29 |
pt.y = bottom - 1; |
|
30 |
return pt; |
|
31 |
} |
|
32 |
||
33 |
/***************************************************** |
|
34 |
* Special handling for the scrollbar widget type. |
|
35 |
* Handles the special scrolling buttons and other |
|
36 |
* scrolling. |
|
37 |
* Parameters: |
|
38 |
* w - Window. |
|
39 |
* wi - Pointer to the scrollbar widget. |
|
40 |
* x - The X coordinate of the mouse click. |
|
41 |
* y - The Y coordinate of the mouse click. |
|
42 |
*/ |
|
43 |
||
44 |
void ScrollbarClickHandler(Window *w, const Widget *wi, int x, int y) |
|
45 |
{ |
|
46 |
int mi, ma, pos; |
|
47 |
Scrollbar *sb; |
|
48 |
||
842 | 49 |
switch (wi->type) { |
50 |
case WWT_SCROLLBAR: { |
|
51 |
// vertical scroller |
|
52 |
w->flags4 &= ~WF_HSCROLL; |
|
53 |
w->flags4 &= ~WF_SCROLL2; |
|
54 |
mi = wi->top; |
|
55 |
ma = wi->bottom; |
|
56 |
pos = y; |
|
57 |
sb = &w->vscroll; |
|
58 |
break; |
|
59 |
} |
|
60 |
case WWT_SCROLL2BAR: { |
|
61 |
// 2nd vertical scroller |
|
62 |
w->flags4 &= ~WF_HSCROLL; |
|
63 |
w->flags4 |= WF_SCROLL2; |
|
64 |
mi = wi->top; |
|
65 |
ma = wi->bottom; |
|
66 |
pos = y; |
|
67 |
sb = &w->vscroll2; |
|
68 |
break; |
|
69 |
} |
|
70 |
case WWT_HSCROLLBAR: { |
|
71 |
// horizontal scroller |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
72 |
w->flags4 &= ~WF_SCROLL2; |
842 | 73 |
w->flags4 |= WF_HSCROLL; |
74 |
mi = wi->left; |
|
75 |
ma = wi->right; |
|
76 |
pos = x; |
|
77 |
sb = &w->hscroll; |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
78 |
break; |
842 | 79 |
} |
845
4960e265d25b
(svn r1326) fixed compiler warnings in vehicle_gui.c and widget.c
bjarni
parents:
842
diff
changeset
|
80 |
default: return; //this should never happen |
0 | 81 |
} |
82 |
if (pos <= mi+9) { |
|
83 |
// Pressing the upper button? |
|
84 |
if (!_demo_mode) { |
|
85 |
w->flags4 |= WF_SCROLL_UP; |
|
86 |
if (_scroller_click_timeout == 0) { |
|
87 |
_scroller_click_timeout = 6; |
|
88 |
if (sb->pos != 0) sb->pos--; |
|
89 |
} |
|
90 |
_left_button_clicked = false; |
|
91 |
} |
|
92 |
} else if (pos >= ma-10) { |
|
93 |
// Pressing the lower button? |
|
94 |
if (!_demo_mode) { |
|
95 |
w->flags4 |= WF_SCROLL_DOWN; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
96 |
|
0 | 97 |
if (_scroller_click_timeout == 0) { |
98 |
_scroller_click_timeout = 6; |
|
99 |
if ((byte)(sb->pos + sb->cap) < sb->count) |
|
100 |
sb->pos++; |
|
101 |
} |
|
102 |
_left_button_clicked = false; |
|
103 |
} |
|
104 |
} else { |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
105 |
// |
0 | 106 |
Point pt = HandleScrollbarHittest(sb, mi, ma); |
107 |
||
108 |
if (pos < pt.x) { |
|
109 |
sb->pos = max(sb->pos - sb->cap, 0); |
|
110 |
} else if (pos > pt.y) { |
|
111 |
sb->pos = min( |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
112 |
sb->pos + sb->cap, |
0 | 113 |
max(sb->count - sb->cap, 0) |
114 |
); |
|
115 |
} else { |
|
116 |
_scrollbar_start_pos = pt.x - mi - 9; |
|
117 |
_scrollbar_size = ma - mi - 23; |
|
118 |
w->flags4 |= WF_SCROLL_MIDDLE; |
|
119 |
_scrolling_scrollbar = true; |
|
120 |
_cursorpos_drag_start = _cursor.pos; |
|
121 |
} |
|
122 |
} |
|
123 |
||
124 |
SetWindowDirty(w); |
|
125 |
} |
|
126 |
||
127 |
/***************************************************** |
|
128 |
* Returns the index for the widget located at the given |
|
129 |
* position relative to the window. |
|
130 |
* Parameters: |
|
131 |
* w - Window |
|
132 |
* x/y - Window client coordinates |
|
133 |
* Returns: |
|
134 |
* A widget index, or -1 if no widget was found. |
|
135 |
*/ |
|
136 |
int GetWidgetFromPos(Window *w, int x, int y) |
|
137 |
{ |
|
138 |
const Widget *wi; |
|
139 |
int index, found_index = -1; |
|
140 |
||
141 |
// Go through the widgets and check if we find the widget that the coordinate is |
|
142 |
// inside. |
|
143 |
for(index=0,wi=w->widget; wi->type != WWT_LAST; index++, wi++) { |
|
144 |
if (wi->type == WWT_EMPTY || wi->type == WWT_FRAME) |
|
145 |
continue; |
|
146 |
||
147 |
if (x >= wi->left && |
|
148 |
x < wi->right && |
|
149 |
y >= wi->top && |
|
150 |
y < wi->bottom && !HASBIT(w->hidden_state,index)) { |
|
151 |
found_index = index; |
|
152 |
} |
|
153 |
} |
|
154 |
||
155 |
// Return the index |
|
156 |
return found_index; |
|
157 |
} |
|
158 |
||
159 |
||
160 |
void DrawWindowWidgets(Window *w) |
|
161 |
{ |
|
162 |
const Widget *wi; |
|
163 |
DrawPixelInfo *dpi = _cur_dpi; |
|
164 |
Rect r; |
|
674
9604d4d8de7d
(svn r1112) -Fix: _decode_parameters was increased to [20], but not all temp-dparams were
truelight
parents:
507
diff
changeset
|
165 |
uint32 dparam_backup[20]; |
0 | 166 |
uint32 cur_click, cur_disabled, cur_hidden; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
167 |
|
0 | 168 |
if (w->desc_flags & WDF_RESTORE_DPARAM) COPY_OUT_DPARAM(dparam_backup, 0, lengthof(dparam_backup)); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
169 |
|
0 | 170 |
wi = w->widget; |
171 |
||
172 |
cur_click = w->click_state; |
|
173 |
cur_disabled = w->disabled_state; |
|
174 |
cur_hidden = w->hidden_state; |
|
175 |
||
176 |
do { |
|
177 |
if (dpi->left > (r.right=/*w->left + */wi->right) || |
|
178 |
dpi->left + dpi->width <= (r.left=wi->left/* + w->left*/) || |
|
179 |
dpi->top > (r.bottom=/*w->top +*/ wi->bottom) || |
|
180 |
dpi->top + dpi->height <= (r.top = /*w->top +*/ wi->top) || |
|
181 |
(cur_hidden&1)) |
|
182 |
continue; |
|
183 |
||
184 |
switch(wi->type&WWT_MASK) { |
|
185 |
case WWT_PANEL: |
|
186 |
case WWT_PANEL_2: { |
|
187 |
int img; |
|
188 |
||
189 |
DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, |
|
190 |
(cur_click & 1) ? 0x20 : 0); |
|
191 |
||
192 |
if ((img=wi->unkA) != 0) { |
|
193 |
if ((wi->type&WWT_MASK) == WWT_PANEL_2 && (cur_click&1)) img++; |
|
194 |
DrawSprite(img, r.left+1, r.top+1); |
|
195 |
} |
|
196 |
goto draw_default; |
|
197 |
} |
|
198 |
||
199 |
case WWT_CLOSEBOX: |
|
200 |
case WWT_4: { |
|
201 |
DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, |
|
202 |
(cur_click & 1) ? 0x20 : 0); |
|
203 |
} |
|
204 |
/* fall through */ |
|
205 |
||
206 |
case WWT_5: { |
|
207 |
StringID str = wi->unkA; |
|
208 |
||
209 |
if ((wi->type&WWT_MASK) == WWT_4 && (cur_click&1)) str++; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
210 |
|
0 | 211 |
DrawStringCentered((r.left + r.right+1)>>1, ((r.top+r.bottom + 1)>>1) - 5, str, 0); |
212 |
goto restore_dparam; |
|
213 |
} |
|
214 |
||
215 |
case WWT_6: { |
|
216 |
StringID str; |
|
217 |
DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, 0x60); |
|
218 |
||
219 |
if ((str = wi->unkA) != 0) { |
|
220 |
DrawString(r.left+2, r.top+1, str, 0); |
|
221 |
goto restore_dparam; |
|
222 |
} |
|
223 |
goto draw_default; |
|
224 |
} |
|
225 |
||
226 |
case WWT_MATRIX: { |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
227 |
int c, d, ctr; |
0 | 228 |
int x, amt1, amt2; |
229 |
int color; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
230 |
|
0 | 231 |
DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, |
232 |
(cur_click & 1) ? 0x20 : 0); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
233 |
|
0 | 234 |
c = (wi->unkA&0xFF); |
235 |
amt1 = (wi->right - wi->left + 1) / c; |
|
236 |
||
237 |
d = (wi->unkA >> 8); |
|
238 |
amt2 = (wi->bottom - wi->top + 1) / d; |
|
239 |
||
240 |
color = _color_list[wi->color&0xF].window_color_bgb; |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
241 |
|
0 | 242 |
x = r.left; |
243 |
for(ctr=c; --ctr; ) { |
|
244 |
x += amt1; |
|
245 |
GfxFillRect(x, r.top+1, x, r.bottom-1, color); |
|
246 |
} |
|
247 |
||
248 |
x = r.top; |
|
249 |
for(ctr=d; --ctr; ) { |
|
250 |
x += amt2; |
|
251 |
GfxFillRect(r.left+1, x, r.right-1, x, color); |
|
252 |
} |
|
253 |
||
254 |
color = _color_list[wi->color&0xF].window_color_1b; |
|
255 |
||
256 |
x = r.left-1; |
|
257 |
for(ctr=c; --ctr; ) { |
|
258 |
x += amt1; |
|
259 |
GfxFillRect(x, r.top+1, x, r.bottom-1, color); |
|
260 |
} |
|
261 |
||
262 |
x = r.top-1; |
|
263 |
for(ctr=d; --ctr; ) { |
|
264 |
x += amt2; |
|
265 |
GfxFillRect(r.left+1, x, r.right-1, x, color); |
|
266 |
} |
|
267 |
||
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
268 |
goto draw_default; |
0 | 269 |
} |
270 |
||
271 |
// vertical scrollbar |
|
272 |
case WWT_SCROLLBAR: { |
|
273 |
Point pt; |
|
274 |
int c1,c2; |
|
275 |
||
893
f4698309dec7
(svn r1379) -Fix: various GUI glitches. Added default sizes to various widgets. Sticky/Resize- and Scrollbar must be 11 pixels wide, Horizontal scrollbar 11 pixels high, caption must be 13 pixels. I hope I didn't forget any widgets, the game will assert for that so report them to me!
darkvater
parents:
884
diff
changeset
|
276 |
assert(r.right - r.left == 11); // XXX - to ensure the same sizes are used everywhere! |
f4698309dec7
(svn r1379) -Fix: various GUI glitches. Added default sizes to various widgets. Sticky/Resize- and Scrollbar must be 11 pixels wide, Horizontal scrollbar 11 pixels high, caption must be 13 pixels. I hope I didn't forget any widgets, the game will assert for that so report them to me!
darkvater
parents:
884
diff
changeset
|
277 |
|
0 | 278 |
// draw up/down buttons |
842 | 279 |
DrawFrameRect(r.left, r.top, r.right, r.top+9, wi->color, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_UP ? 0x20 : 0); |
280 |
DrawFrameRect(r.left, r.bottom-9, r.right, r.bottom, wi->color, (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_DOWN ? 0x20 : 0); |
|
0 | 281 |
|
282 |
// draw icons in up/down buttons |
|
283 |
DoDrawString("\xA0", r.left+2, r.top, 0x10); |
|
284 |
DoDrawString("\xAA", r.left+2, r.bottom-9, 0x10); |
|
285 |
||
286 |
c1 = _color_list[wi->color&0xF].window_color_1a; |
|
287 |
c2 = _color_list[wi->color&0xF].window_color_2; |
|
288 |
||
289 |
// draw "shaded" background |
|
290 |
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c2); |
|
291 |
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c1 | 0x8000); |
|
292 |
||
293 |
// draw shaded lines |
|
294 |
GfxFillRect(r.left+2, r.top+10, r.left+2, r.bottom-10, c1); |
|
295 |
GfxFillRect(r.left+3, r.top+10, r.left+3, r.bottom-10, c2); |
|
296 |
GfxFillRect(r.left+7, r.top+10, r.left+7, r.bottom-10, c1); |
|
297 |
GfxFillRect(r.left+8, r.top+10, r.left+8, r.bottom-10, c2); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
298 |
|
0 | 299 |
pt = HandleScrollbarHittest(&w->vscroll, r.top, r.bottom); |
842 | 300 |
DrawFrameRect(r.left, pt.x, r.right, pt.y, wi->color, (w->flags4 & (WF_SCROLL_MIDDLE | WF_HSCROLL | WF_SCROLL2)) == WF_SCROLL_MIDDLE ? 0x20 : 0); |
301 |
break; |
|
302 |
} |
|
303 |
case WWT_SCROLL2BAR: { |
|
304 |
Point pt; |
|
305 |
int c1,c2; |
|
306 |
||
893
f4698309dec7
(svn r1379) -Fix: various GUI glitches. Added default sizes to various widgets. Sticky/Resize- and Scrollbar must be 11 pixels wide, Horizontal scrollbar 11 pixels high, caption must be 13 pixels. I hope I didn't forget any widgets, the game will assert for that so report them to me!
darkvater
parents:
884
diff
changeset
|
307 |
assert(r.right - r.left == 11); // XXX - to ensure the same sizes are used everywhere! |
f4698309dec7
(svn r1379) -Fix: various GUI glitches. Added default sizes to various widgets. Sticky/Resize- and Scrollbar must be 11 pixels wide, Horizontal scrollbar 11 pixels high, caption must be 13 pixels. I hope I didn't forget any widgets, the game will assert for that so report them to me!
darkvater
parents:
884
diff
changeset
|
308 |
|
842 | 309 |
// draw up/down buttons |
310 |
DrawFrameRect(r.left, r.top, r.right, r.top+9, wi->color, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_UP | WF_SCROLL2) ? 0x20 : 0); |
|
311 |
DrawFrameRect(r.left, r.bottom-9, r.right, r.bottom, wi->color, (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_DOWN | WF_SCROLL2) ? 0x20 : 0); |
|
312 |
||
313 |
// draw icons in up/down buttons |
|
314 |
DoDrawString("\xA0", r.left+2, r.top, 0x10); |
|
315 |
DoDrawString("\xAA", r.left+2, r.bottom-9, 0x10); |
|
316 |
||
317 |
c1 = _color_list[wi->color&0xF].window_color_1a; |
|
318 |
c2 = _color_list[wi->color&0xF].window_color_2; |
|
319 |
||
320 |
// draw "shaded" background |
|
321 |
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c2); |
|
322 |
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c1 | 0x8000); |
|
323 |
||
324 |
// draw shaded lines |
|
325 |
GfxFillRect(r.left+2, r.top+10, r.left+2, r.bottom-10, c1); |
|
326 |
GfxFillRect(r.left+3, r.top+10, r.left+3, r.bottom-10, c2); |
|
327 |
GfxFillRect(r.left+7, r.top+10, r.left+7, r.bottom-10, c1); |
|
328 |
GfxFillRect(r.left+8, r.top+10, r.left+8, r.bottom-10, c2); |
|
329 |
||
330 |
pt = HandleScrollbarHittest(&w->vscroll2, r.top, r.bottom); |
|
331 |
DrawFrameRect(r.left, pt.x, r.right, pt.y, wi->color, (w->flags4 & (WF_SCROLL_MIDDLE | WF_HSCROLL | WF_SCROLL2)) == (WF_SCROLL_MIDDLE | WF_SCROLL2) ? 0x20 : 0); |
|
0 | 332 |
break; |
333 |
} |
|
334 |
||
335 |
// horizontal scrollbar |
|
336 |
case WWT_HSCROLLBAR: { |
|
337 |
Point pt; |
|
338 |
int c1,c2; |
|
339 |
||
894
8b59c639837d
(svn r1380) -Fix: missed widget fixes; thanks Jango and TestMan57
darkvater
parents:
893
diff
changeset
|
340 |
assert(r.bottom - r.top == 11); // XXX - to ensure the same sizes are used everywhere! |
893
f4698309dec7
(svn r1379) -Fix: various GUI glitches. Added default sizes to various widgets. Sticky/Resize- and Scrollbar must be 11 pixels wide, Horizontal scrollbar 11 pixels high, caption must be 13 pixels. I hope I didn't forget any widgets, the game will assert for that so report them to me!
darkvater
parents:
884
diff
changeset
|
341 |
|
0 | 342 |
DrawFrameRect(r.left, r.top, r.left + 9, r.bottom, wi->color, (w->flags4 & (WF_SCROLL_UP | WF_HSCROLL)) == (WF_SCROLL_UP | WF_HSCROLL) ? 0x20 : 0); |
343 |
DrawFrameRect(r.right-9, r.top, r.right, r.bottom, wi->color, (w->flags4 & (WF_SCROLL_DOWN | WF_HSCROLL)) == (WF_SCROLL_DOWN | WF_HSCROLL) ? 0x20 : 0); |
|
344 |
||
345 |
// draw icons in up/down buttons |
|
884
c5bf8b3dbab4
(svn r1369) -Feature(ish): Added sprites for up/down and left/right arrows. Anywhere where there are horizontal scrollers these are now left/right arrows
darkvater
parents:
883
diff
changeset
|
346 |
DrawSprite(SPR_ARROW_LEFT, r.left + 3, r.top + 2); |
c5bf8b3dbab4
(svn r1369) -Feature(ish): Added sprites for up/down and left/right arrows. Anywhere where there are horizontal scrollers these are now left/right arrows
darkvater
parents:
883
diff
changeset
|
347 |
DrawSprite(SPR_ARROW_RIGHT, r.right - 6, r.top + 2); |
0 | 348 |
|
349 |
c1 = _color_list[wi->color&0xF].window_color_1a; |
|
350 |
c2 = _color_list[wi->color&0xF].window_color_2; |
|
351 |
||
352 |
// draw "shaded" background |
|
353 |
GfxFillRect(r.left+10, r.top, r.right-10, r.bottom, c2); |
|
354 |
GfxFillRect(r.left+10, r.top, r.right-10, r.bottom, c1 | 0x8000); |
|
355 |
||
356 |
// draw shaded lines |
|
357 |
GfxFillRect(r.left+10, r.top+2, r.right-10, r.top+2, c1); |
|
358 |
GfxFillRect(r.left+10, r.top+3, r.right-10, r.top+3, c2); |
|
359 |
GfxFillRect(r.left+10, r.top+7, r.right-10, r.top+7, c1); |
|
360 |
GfxFillRect(r.left+10, r.top+8, r.right-10, r.top+8, c2); |
|
361 |
||
362 |
// draw actual scrollbar |
|
363 |
pt = HandleScrollbarHittest(&w->hscroll, r.left, r.right); |
|
364 |
DrawFrameRect(pt.x, r.top, pt.y, r.bottom, wi->color, (w->flags4 & (WF_SCROLL_MIDDLE | WF_HSCROLL)) == (WF_SCROLL_MIDDLE | WF_HSCROLL) ? 0x20 : 0); |
|
365 |
||
366 |
break; |
|
367 |
} |
|
368 |
||
369 |
case WWT_FRAME: { |
|
370 |
int c1,c2; |
|
860
fad6642f6217
(svn r1341) -Fix: fix WWT_FRAME drawing when there is no text there (STR_NULL)
darkvater
parents:
845
diff
changeset
|
371 |
int x2 = r.left; // by default the left side is the left side of the widget |
0 | 372 |
|
373 |
if (wi->unkA != 0) { |
|
374 |
x2 = DrawString(r.left+6, r.top, wi->unkA, 0); |
|
375 |
} |
|
376 |
||
377 |
c1 = _color_list[wi->color].window_color_1a; |
|
378 |
c2 = _color_list[wi->color].window_color_2; |
|
379 |
||
380 |
//Line from upper left corner to start of text |
|
381 |
GfxFillRect(r.left, r.top+4, r.left+4,r.top+4, c1); |
|
382 |
GfxFillRect(r.left+1, r.top+5, r.left+4,r.top+5, c2); |
|
383 |
||
384 |
// Line from end of text to upper right corner |
|
385 |
GfxFillRect(x2, r.top+4, r.right-1,r.top+4,c1); |
|
386 |
GfxFillRect(x2, r.top+5, r.right-2,r.top+5,c2); |
|
387 |
||
388 |
// Line from upper left corner to bottom left corner |
|
389 |
GfxFillRect(r.left, r.top+5, r.left, r.bottom-1, c1); |
|
390 |
GfxFillRect(r.left+1, r.top+6, r.left+1, r.bottom-2, c2); |
|
391 |
||
392 |
//Line from upper right corner to bottom right corner |
|
393 |
GfxFillRect(r.right-1, r.top+5, r.right-1, r.bottom-2, c1); |
|
394 |
GfxFillRect(r.right, r.top+4, r.right, r.bottom-1, c2); |
|
395 |
||
396 |
GfxFillRect(r.left+1, r.bottom-1, r.right-1, r.bottom-1, c1); |
|
397 |
GfxFillRect(r.left, r.bottom, r.right, r.bottom, c2); |
|
398 |
||
399 |
goto restore_dparam; |
|
400 |
} |
|
401 |
||
682
74c70f645d95
(svn r1121) -Feature: Added sticky windows feature. A small pin allows the user to set the window as undeletable and can only be closed by hand. As an example the viewport window has been stickied (thanks to Neko-San)
darkvater
parents:
674
diff
changeset
|
402 |
case WWT_STICKYBOX: { |
893
f4698309dec7
(svn r1379) -Fix: various GUI glitches. Added default sizes to various widgets. Sticky/Resize- and Scrollbar must be 11 pixels wide, Horizontal scrollbar 11 pixels high, caption must be 13 pixels. I hope I didn't forget any widgets, the game will assert for that so report them to me!
darkvater
parents:
884
diff
changeset
|
403 |
assert(r.right - r.left == 11); // XXX - to ensure the same sizes are used everywhere! |
682
74c70f645d95
(svn r1121) -Feature: Added sticky windows feature. A small pin allows the user to set the window as undeletable and can only be closed by hand. As an example the viewport window has been stickied (thanks to Neko-San)
darkvater
parents:
674
diff
changeset
|
404 |
DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, (cur_click & 1) ? 0x20 : 0); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
405 |
DrawSprite((cur_click & 1) ? SPR_PIN_UP : SPR_PIN_DOWN, r.left + 2, r.top + 3); |
682
74c70f645d95
(svn r1121) -Feature: Added sticky windows feature. A small pin allows the user to set the window as undeletable and can only be closed by hand. As an example the viewport window has been stickied (thanks to Neko-San)
darkvater
parents:
674
diff
changeset
|
406 |
break; |
74c70f645d95
(svn r1121) -Feature: Added sticky windows feature. A small pin allows the user to set the window as undeletable and can only be closed by hand. As an example the viewport window has been stickied (thanks to Neko-San)
darkvater
parents:
674
diff
changeset
|
407 |
} |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
408 |
|
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
409 |
case WWT_RESIZEBOX: { |
893
f4698309dec7
(svn r1379) -Fix: various GUI glitches. Added default sizes to various widgets. Sticky/Resize- and Scrollbar must be 11 pixels wide, Horizontal scrollbar 11 pixels high, caption must be 13 pixels. I hope I didn't forget any widgets, the game will assert for that so report them to me!
darkvater
parents:
884
diff
changeset
|
410 |
assert(r.right - r.left == 11); // XXX - to ensure the same sizes are used everywhere! |
915 | 411 |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
412 |
DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, 0); |
893
f4698309dec7
(svn r1379) -Fix: various GUI glitches. Added default sizes to various widgets. Sticky/Resize- and Scrollbar must be 11 pixels wide, Horizontal scrollbar 11 pixels high, caption must be 13 pixels. I hope I didn't forget any widgets, the game will assert for that so report them to me!
darkvater
parents:
884
diff
changeset
|
413 |
DrawSprite(SPR_WINDOW_RESIZE, r.left + 3, r.top + 3); |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
414 |
break; |
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
415 |
} |
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
416 |
|
0 | 417 |
case WWT_CAPTION: { |
893
f4698309dec7
(svn r1379) -Fix: various GUI glitches. Added default sizes to various widgets. Sticky/Resize- and Scrollbar must be 11 pixels wide, Horizontal scrollbar 11 pixels high, caption must be 13 pixels. I hope I didn't forget any widgets, the game will assert for that so report them to me!
darkvater
parents:
884
diff
changeset
|
418 |
assert(r.bottom - r.top == 13); // XXX - to ensure the same sizes are used everywhere! |
0 | 419 |
DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, 0x10); |
420 |
DrawFrameRect(r.left+1, r.top+1, r.right-1, r.bottom-1, wi->color, (w->caption_color == 0xFF) ? 0x60 : 0x70); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
421 |
|
0 | 422 |
if (w->caption_color != 0xFF) { |
423 |
GfxFillRect(r.left+2, r.top+2, r.right-2, r.bottom-2, _color_list[_player_colors[w->caption_color]].window_color_1b); |
|
424 |
} |
|
425 |
||
426 |
DrawStringCentered( (r.left+r.right+1)>>1, r.top+2, wi->unkA, 0x84); |
|
427 |
restore_dparam:; |
|
428 |
if (w->desc_flags & WDF_RESTORE_DPARAM) COPY_IN_DPARAM(0, dparam_backup, lengthof(dparam_backup)); |
|
429 |
draw_default:; |
|
430 |
if (cur_disabled & 1) { |
|
431 |
GfxFillRect(r.left+1, r.top+1, r.right-1, r.bottom-1, _color_list[wi->color&0xF].unk2 | 0x8000); |
|
432 |
} |
|
433 |
} |
|
434 |
} |
|
435 |
} while (cur_click>>=1, cur_disabled>>=1, cur_hidden >>= 1, (++wi)->type != WWT_LAST); |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
436 |
|
0 | 437 |
|
438 |
if (w->flags4 & WF_WHITE_BORDER_MASK) { |
|
439 |
//DrawFrameRect(w->left, w->top, w->left + w->width-1, w->top+w->height-1, 0xF, 0x10); |
|
440 |
DrawFrameRect(0, 0, w->width-1, w->height-1, 0xF, 0x10); |
|
441 |
} |
|
442 |
||
443 |
} |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
444 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
445 |
static uint _dropdown_item_count; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
446 |
static uint32 _dropdown_disabled; |
842 | 447 |
static bool _dropdown_hide_disabled; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
448 |
static const StringID *_dropdown_items; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
449 |
static int _dropdown_selindex; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
450 |
static byte _dropdown_button; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
451 |
static WindowClass _dropdown_windowclass; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
452 |
static WindowNumber _dropdown_windownum; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
453 |
static byte _dropdown_var1; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
454 |
static byte _dropdown_var2; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
455 |
|
883
9bfde7bab1f9
(svn r1368) -Fix: Disabled dropdown menu options are gray again (instead of blue)
truelight
parents:
876
diff
changeset
|
456 |
static const Widget _dropdown_menu_widgets[] = { |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
457 |
{ WWT_IMGBTN, RESIZE_NONE, 0, 0, 0, 0, 0, 0x0, STR_NULL}, |
176
84990c4b9212
(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
darkvater
parents:
164
diff
changeset
|
458 |
{ WIDGETS_END}, |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
459 |
}; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
460 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
461 |
static int GetDropdownItem(Window *w) |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
462 |
{ |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
463 |
uint item; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
464 |
int y; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
465 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
466 |
if (GetWidgetFromPos(w, _cursor.pos.x - w->left, _cursor.pos.y - w->top) < 0) |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
467 |
return -1; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
468 |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
469 |
y = _cursor.pos.y - w->top - 2; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
470 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
471 |
if (y < 0) |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
472 |
return - 1; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
473 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
474 |
item = y / 10; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
475 |
if (item >= _dropdown_item_count || HASBIT(_dropdown_disabled,item) || _dropdown_items[item] == 0) |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
476 |
return - 1; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
477 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
478 |
return item; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
479 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
480 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
481 |
void DropdownMenuWndProc(Window *w, WindowEvent *e) |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
482 |
{ |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
483 |
int item; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
484 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
485 |
switch(e->event) { |
842 | 486 |
case WE_PAINT: { |
487 |
int x,y,i,sel; |
|
488 |
uint32 dis; |
|
489 |
bool hidden; |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
490 |
|
842 | 491 |
DrawWindowWidgets(w); |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
492 |
|
842 | 493 |
x = 1; |
494 |
y = 2; |
|
495 |
sel = _dropdown_selindex; |
|
496 |
dis = _dropdown_disabled; |
|
497 |
hidden = _dropdown_hide_disabled; |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
498 |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
499 |
|
842 | 500 |
for(i=0; _dropdown_items[i] != INVALID_STRING_ID; i++) { |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
501 |
if (!(hidden && (dis & 1))) { |
842 | 502 |
if (_dropdown_items[i] != 0) { |
503 |
if (sel == 0) { |
|
504 |
GfxFillRect(x+1, y, x+w->width-4, y + 9, 0); |
|
505 |
} |
|
506 |
DrawString(x+2, y, _dropdown_items[i], sel==0 ? 12 : 16); |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
507 |
|
842 | 508 |
if (dis & 1) { |
509 |
GfxFillRect(x, y, x+w->width-3, y + 9, 0x8000 + |
|
883
9bfde7bab1f9
(svn r1368) -Fix: Disabled dropdown menu options are gray again (instead of blue)
truelight
parents:
876
diff
changeset
|
510 |
_color_list[w->widget[0].color].window_color_bga); |
842 | 511 |
} |
512 |
} else { |
|
883
9bfde7bab1f9
(svn r1368) -Fix: Disabled dropdown menu options are gray again (instead of blue)
truelight
parents:
876
diff
changeset
|
513 |
int color_1 = _color_list[w->widget[0].color].window_color_1a; |
9bfde7bab1f9
(svn r1368) -Fix: Disabled dropdown menu options are gray again (instead of blue)
truelight
parents:
876
diff
changeset
|
514 |
int color_2 = _color_list[w->widget[0].color].window_color_2; |
842 | 515 |
GfxFillRect(x+1, y+3, x+w->width-5, y+3, color_1); |
516 |
GfxFillRect(x+1, y+4, x+w->width-5, y+4, color_2); |
|
517 |
} |
|
518 |
y += 10; |
|
519 |
sel--; |
|
520 |
} |
|
521 |
dis>>=1; |
|
522 |
} |
|
523 |
} break; |
|
524 |
||
525 |
case WE_CLICK: { |
|
526 |
item = GetDropdownItem(w); |
|
527 |
if (item >= 0) { |
|
528 |
_dropdown_var1 = 4; |
|
529 |
_dropdown_selindex = item; |
|
530 |
SetWindowDirty(w); |
|
531 |
} |
|
532 |
} break; |
|
533 |
||
534 |
case WE_MOUSELOOP: { |
|
535 |
Window *w2 = FindWindowById(_dropdown_windowclass, _dropdown_windownum); |
|
536 |
if (w2 == NULL) { |
|
537 |
DeleteWindow(w); |
|
538 |
return; |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
539 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
540 |
|
842 | 541 |
if (_dropdown_var1 != 0 && --_dropdown_var1 == 0) { |
542 |
WindowEvent e; |
|
543 |
e.event = WE_DROPDOWN_SELECT; |
|
544 |
e.dropdown.button = _dropdown_button; |
|
545 |
e.dropdown.index = _dropdown_selindex; |
|
546 |
w2->wndproc(w2, &e); |
|
547 |
DeleteWindow(w); |
|
548 |
return; |
|
549 |
} |
|
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
550 |
|
842 | 551 |
if (_dropdown_var2 != 0) { |
552 |
item = GetDropdownItem(w); |
|
553 |
||
554 |
if (!_left_button_clicked) { |
|
555 |
_dropdown_var2 = 0; |
|
556 |
if (item < 0) |
|
557 |
return; |
|
558 |
_dropdown_var1 = 2; |
|
559 |
} else { |
|
560 |
if (item < 0) |
|
561 |
return; |
|
562 |
} |
|
563 |
||
564 |
_dropdown_selindex = item; |
|
565 |
SetWindowDirty(w); |
|
566 |
} |
|
567 |
} break; |
|
568 |
||
569 |
case WE_DESTROY: { |
|
570 |
Window *w2 = FindWindowById(_dropdown_windowclass, _dropdown_windownum); |
|
571 |
if (w2 != NULL) { |
|
572 |
CLRBIT(w2->click_state, _dropdown_button); |
|
573 |
InvalidateWidget(w2, _dropdown_button); |
|
574 |
} |
|
575 |
} break; |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
576 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
577 |
} |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
578 |
|
842 | 579 |
void ShowDropDownMenu(Window *w, const StringID *strings, int selected, int button, uint32 disabled_mask, bool remove_filtered_strings) |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
580 |
{ |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
581 |
WindowNumber num; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
582 |
WindowClass cls; |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
583 |
int i; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
584 |
const Widget *wi; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
585 |
Window *w2; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
586 |
uint32 old_click_state = w->click_state; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
587 |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
588 |
_dropdown_disabled = disabled_mask; |
842 | 589 |
_dropdown_hide_disabled = remove_filtered_strings; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
590 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
591 |
cls = w->window_class; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
592 |
num = w->window_number; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
593 |
DeleteWindowById(WC_DROPDOWN_MENU, 0); |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
594 |
w = FindWindowById(cls, num); |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
595 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
596 |
if (HASBIT(old_click_state, button)) |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
597 |
return; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
598 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
599 |
SETBIT(w->click_state, button); |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
600 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
601 |
InvalidateWidget(w, button); |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
602 |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
603 |
for(i=0;strings[i] != INVALID_STRING_ID;i++); |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
604 |
if (i == 0) |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
605 |
return; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
606 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
607 |
_dropdown_items = strings; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
608 |
_dropdown_item_count = i; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
609 |
_dropdown_selindex = selected; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
610 |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
611 |
_dropdown_windowclass = w->window_class; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
612 |
_dropdown_windownum = w->window_number; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
613 |
_dropdown_button = button; |
193
0a7025304867
(svn r194) -Codechange: stripping trailing-spaces. Please keep this that way!
truelight
parents:
176
diff
changeset
|
614 |
|
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
615 |
_dropdown_var1 = 0; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
616 |
_dropdown_var2 = 1; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
617 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
618 |
wi = &w->widget[button]; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
619 |
|
842 | 620 |
if ( remove_filtered_strings ) { |
621 |
int j; |
|
622 |
for(j=0; _dropdown_items[j] != INVALID_STRING_ID; j++) { |
|
623 |
if ( disabled_mask & ( 1 << j )) { |
|
624 |
_dropdown_item_count--; |
|
625 |
i--; |
|
626 |
} |
|
627 |
} |
|
628 |
} |
|
629 |
||
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
630 |
w2 = AllocateWindow( |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
631 |
w->left + wi[-1].left + 1, |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
632 |
w->top + wi->bottom + 2, |
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
633 |
wi->right - wi[-1].left + 1, |
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
634 |
i * 10 + 4, |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
635 |
DropdownMenuWndProc, |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
636 |
0x3F, |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
637 |
_dropdown_menu_widgets); |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
638 |
|
867
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
639 |
w2->widget[0].color = wi->color; |
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
640 |
w2->widget[0].right = wi->right - wi[-1].left; |
dffd33233237
(svn r1348) -Feature: resizable windows. Read the comment in window.h to find out
truelight
parents:
860
diff
changeset
|
641 |
w2->widget[0].bottom = i * 10 + 3; |
164
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
642 |
|
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
643 |
w2->flags4 &= ~WF_WHITE_BORDER_MASK; |
0cbdf3c9bde1
(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).
darkvater
parents:
0
diff
changeset
|
644 |
} |