openttd: src/widget.cpp annotate

annotate src/widget.cpp @ 8411:e0420e29320d draft

(svn r11981) -Fix [FS#1698]: Use unicode glyph mapping to fix up missing/shuffled sprites in original data files instead of shuffling or skipping sprites directly. Some required glyphs were not loaded. -Fix: Large capital U with grave (Ù) along with some other glyphs are broken in the original data files, so do no display them.

author	peter1138 <peter1138@openttd.org>
date	Fri, 25 Jan 2008 13:48:39 +0000 (2008-01-25)
parents	cbb2e614bcfa
children	3a56a9f2f4c3

rev	line source
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	1 /* $Id$ */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	2
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	3 /** @file widget.cpp */
fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	4
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	5 #include "stdafx.h"
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	6 #include "openttd.h"
8254 7d580c9c41fb (svn r11818) -Codechange: split player.h into smaller pieces. rubidium <rubidium@openttd.org> parents: 8224 diff changeset	7 #include "core/math_func.hpp"
7d580c9c41fb (svn r11818) -Codechange: split player.h into smaller pieces. rubidium <rubidium@openttd.org> parents: 8224 diff changeset	8 #include "player_func.h"
8224 c45446125bf0 (svn r11787) -Codechange: more header rewrites. This time related to viewport.h. rubidium <rubidium@openttd.org> parents: 8131 diff changeset	9 #include "gfx_func.h"
8106 47b1794a7eca (svn r11667) -Codechange: split window.h into a header that defines some 'global' window related types, on that defined 'global' window functions and one that defines functions and types only used by _gui.cpps. rubidium <rubidium@openttd.org>* parents: 8082 diff changeset	10 #include "window_gui.h"
8131 e300ac8001ae (svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h' rubidium <rubidium@openttd.org> parents: 8121 diff changeset	11 #include "window_func.h"
8284 dbb7bfe0e95c (svn r11848) -Codechange: New class-based drop down list functionality. Lists are now dynamically generated, and can include parameters, or be extended however needed. peter1138 <peter1138@openttd.org> parents: 8264 diff changeset	12 #include "widgets/dropdown_func.h"
8131 e300ac8001ae (svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h' rubidium <rubidium@openttd.org> parents: 8121 diff changeset	13
8264 2495310e220f (svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h. rubidium <rubidium@openttd.org> parents: 8254 diff changeset	14 #include "table/sprites.h"
2495310e220f (svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h. rubidium <rubidium@openttd.org> parents: 8254 diff changeset	15 #include "table/strings.h"
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	16
8411 e0420e29320d (svn r11981) -Fix [FS#1698]: Use unicode glyph mapping to fix up missing/shuffled sprites in original data files instead of shuffling or skipping peter1138 <peter1138@openttd.org> parents: 8349 diff changeset	17 static const char *UPARROW = "\xEE\x8A\xA0";
8349 cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	18 static const char *DOWNARROW = "\xEE\x8A\xAA";
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	19
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	20 static Point HandleScrollbarHittest(const Scrollbar *sb, int top, int bottom)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	21 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	22 Point pt;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	23 int height, count, pos, cap;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	24
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	25 top += 10;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	26 bottom -= 9;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	27
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	28 height = (bottom - top);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	29
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	30 pos = sb->pos;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	31 count = sb->count;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	32 cap = sb->cap;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	33
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	34 if (count != 0) top += height * pos / count;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	35
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	36 if (cap > count) cap = count;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	37 if (count != 0) bottom -= (count - pos - cap) * height / count;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	38
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	39 pt.x = top;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	40 pt.y = bottom - 1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	41 return pt;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	42 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	43
6481 85a1a79387a2 (svn r9662) -Documentation: Doxygen corrections and @file omissions belugas <belugas@openttd.org> parents: 6432 diff changeset	44 /** Special handling for the scrollbar widget type.
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	45 * Handles the special scrolling buttons and other
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	46 * scrolling.
6481 85a1a79387a2 (svn r9662) -Documentation: Doxygen corrections and @file omissions belugas <belugas@openttd.org> parents: 6432 diff changeset	47 * @param w Window on which a scroll was performed.
85a1a79387a2 (svn r9662) -Documentation: Doxygen corrections and @file omissions belugas <belugas@openttd.org> parents: 6432 diff changeset	48 * @param wi Pointer to the scrollbar widget.
85a1a79387a2 (svn r9662) -Documentation: Doxygen corrections and @file omissions belugas <belugas@openttd.org> parents: 6432 diff changeset	49 * @param x The X coordinate of the mouse click.
85a1a79387a2 (svn r9662) -Documentation: Doxygen corrections and @file omissions belugas <belugas@openttd.org> parents: 6432 diff changeset	50 * @param y The Y coordinate of the mouse click. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	51 void ScrollbarClickHandler(Window w, const Widget wi, int x, int y)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	52 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	53 int mi, ma, pos;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	54 Scrollbar *sb;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	55
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	56 switch (wi->type) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	57 case WWT_SCROLLBAR: {
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	58 /* vertical scroller */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	59 w->flags4 &= ~WF_HSCROLL;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	60 w->flags4 &= ~WF_SCROLL2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	61 mi = wi->top;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	62 ma = wi->bottom;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	63 pos = y;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	64 sb = &w->vscroll;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	65 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	66 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	67 case WWT_SCROLL2BAR: {
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	68 /* 2nd vertical scroller */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	69 w->flags4 &= ~WF_HSCROLL;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	70 w->flags4 \|= WF_SCROLL2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	71 mi = wi->top;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	72 ma = wi->bottom;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	73 pos = y;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	74 sb = &w->vscroll2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	75 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	76 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	77 case WWT_HSCROLLBAR: {
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	78 /* horizontal scroller */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	79 w->flags4 &= ~WF_SCROLL2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	80 w->flags4 \|= WF_HSCROLL;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	81 mi = wi->left;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	82 ma = wi->right;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	83 pos = x;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	84 sb = &w->hscroll;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	85 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	86 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	87 default: return; //this should never happen
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	88 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	89 if (pos <= mi+9) {
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	90 /* Pressing the upper button? */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	91 w->flags4 \|= WF_SCROLL_UP;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	92 if (_scroller_click_timeout == 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	93 _scroller_click_timeout = 6;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	94 if (sb->pos != 0) sb->pos--;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	95 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	96 _left_button_clicked = false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	97 } else if (pos >= ma-10) {
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	98 /* Pressing the lower button? */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	99 w->flags4 \|= WF_SCROLL_DOWN;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	100
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	101 if (_scroller_click_timeout == 0) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	102 _scroller_click_timeout = 6;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	103 if ((byte)(sb->pos + sb->cap) < sb->count)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	104 sb->pos++;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	105 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	106 _left_button_clicked = false;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	107 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	108 Point pt = HandleScrollbarHittest(sb, mi, ma);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	109
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	110 if (pos < pt.x) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	111 sb->pos = max(sb->pos - sb->cap, 0);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	112 } else if (pos > pt.y) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	113 sb->pos = min(
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	114 sb->pos + sb->cap,
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	115 max(sb->count - sb->cap, 0)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	116 );
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	117 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	118 _scrollbar_start_pos = pt.x - mi - 9;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	119 _scrollbar_size = ma - mi - 23;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	120 w->flags4 \|= WF_SCROLL_MIDDLE;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	121 _scrolling_scrollbar = true;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	122 _cursorpos_drag_start = _cursor.pos;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	123 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	124 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	125
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	126 SetWindowDirty(w);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	127 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	128
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	129 /** Returns the index for the widget located at the given position
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	130 * relative to the window. It includes all widget-corner pixels as well.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	131 * @param *w Window to look inside
6481 85a1a79387a2 (svn r9662) -Documentation: Doxygen corrections and @file omissions belugas <belugas@openttd.org> parents: 6432 diff changeset	132 * @param x The Window client X coordinate
85a1a79387a2 (svn r9662) -Documentation: Doxygen corrections and @file omissions belugas <belugas@openttd.org> parents: 6432 diff changeset	133 * @param y The Window client y coordinate
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	134 * @return A widget index, or -1 if no widget was found.
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	135 */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	136 int GetWidgetFromPos(const Window *w, int x, int y)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	137 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	138 uint index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	139 int found_index = -1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	140
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	141 /* Go through the widgets and check if we find the widget that the coordinate is
fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	142 * inside. */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	143 for (index = 0; index < w->widget_count; index++) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	144 const Widget *wi = &w->widget[index];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	145 if (wi->type == WWT_EMPTY \|\| wi->type == WWT_FRAME) continue;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	146
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	147 if (x >= wi->left && x <= wi->right && y >= wi->top && y <= wi->bottom &&
7997 d109780d515b (svn r11555) -Codechange: use the new members introduced in r11551. rubidium <rubidium@openttd.org> parents: 7962 diff changeset	148 !w->IsWidgetHidden(index)) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	149 found_index = index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	150 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	151 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	152
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	153 return found_index;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	154 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	155
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	156
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	157 void DrawFrameRect(int left, int top, int right, int bottom, int ctab, FrameFlags flags)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	158 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	159 uint dark = _colour_gradient[ctab][3];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	160 uint medium_dark = _colour_gradient[ctab][5];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	161 uint medium_light = _colour_gradient[ctab][6];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	162 uint light = _colour_gradient[ctab][7];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	163
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	164 if (flags & FR_TRANSPARENT) {
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5587 diff changeset	165 GfxFillRect(left, top, right, bottom, PALETTE_TO_TRANSPARENT \| (1 << USE_COLORTABLE));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	166 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	167 uint interior;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	168
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	169 if (flags & FR_LOWERED) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	170 GfxFillRect(left, top, left, bottom, dark);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	171 GfxFillRect(left + 1, top, right, top, dark);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	172 GfxFillRect(right, top + 1, right, bottom - 1, light);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	173 GfxFillRect(left + 1, bottom, right, bottom, light);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	174 interior = (flags & FR_DARKENED ? medium_dark : medium_light);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	175 } else {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	176 GfxFillRect(left, top, left, bottom - 1, light);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	177 GfxFillRect(left + 1, top, right - 1, top, light);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	178 GfxFillRect(right, top, right, bottom - 1, dark);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	179 GfxFillRect(left, bottom, right, bottom, dark);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	180 interior = medium_dark;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	181 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	182 if (!(flags & FR_BORDERONLY)) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	183 GfxFillRect(left + 1, top + 1, right - 1, bottom - 1, interior);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	184 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	185 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	186 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	187
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	188
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	189 void DrawWindowWidgets(const Window *w)
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	190 {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	191 const DrawPixelInfo* dpi = _cur_dpi;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	192
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	193 for (uint i = 0; i < w->widget_count; i++) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	194 const Widget *wi = &w->widget[i];
7997 d109780d515b (svn r11555) -Codechange: use the new members introduced in r11551. rubidium <rubidium@openttd.org> parents: 7962 diff changeset	195 bool clicked = w->IsWidgetLowered(i);
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	196 Rect r;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	197
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	198 if (dpi->left > (r.right = wi->right) \|\|
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	199 dpi->left + dpi->width <= (r.left = wi->left) \|\|
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	200 dpi->top > (r.bottom = wi->bottom) \|\|
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	201 dpi->top + dpi->height <= (r.top = wi->top) \|\|
7997 d109780d515b (svn r11555) -Codechange: use the new members introduced in r11551. rubidium <rubidium@openttd.org> parents: 7962 diff changeset	202 w->IsWidgetHidden(i)) {
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	203 continue;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	204 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	205
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	206 switch (wi->type & WWT_MASK) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	207 case WWT_IMGBTN:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	208 case WWT_IMGBTN_2: {
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	209 SpriteID img = wi->data;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	210 assert(img != 0);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	211 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	212
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	213 /* show different image when clicked for WWT_IMGBTN_2 */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	214 if ((wi->type & WWT_MASK) == WWT_IMGBTN_2 && clicked) img++;
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5587 diff changeset	215 DrawSprite(img, PAL_NONE, r.left + 1 + clicked, r.top + 1 + clicked);
8320 06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	216 break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	217 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	218
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	219 case WWT_PANEL: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	220 assert(wi->data == 0);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	221 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
8320 06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	222 break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	223 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	224
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	225 case WWT_TEXTBTN:
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	226 case WWT_TEXTBTN_2: {
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	227 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	228 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	229 /* fall through */
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	230
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	231 case WWT_LABEL: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	232 StringID str = wi->data;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	233
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	234 if ((wi->type & WWT_MASK) == WWT_TEXTBTN_2 && clicked) str++;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	235
7824 7ae5bda4e8dd (svn r11374) -Codechange: Give meaning to the magical number that specifies the color of the text in a DrawString call. belugas <belugas@openttd.org> parents: 6481 diff changeset	236 DrawStringCentered(((r.left + r.right + 1) >> 1) + clicked, ((r.top + r.bottom + 1) >> 1) - 5 + clicked, str, TC_FROMSTRING);
8320 06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	237 break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	238 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	239
6278 b57f385b355c (svn r9088) -Add : a new type of widget, called WWT_TEXT. It is a simple truncated string. It will be usefull on windows where lot of simple text is always drawn on the WE_PAINT event, making the code clearer. For now, left, right (total size of the window), top, color and data are necessary to use it. Maybe more features will be available soon. belugas <belugas@openttd.org> parents: 5824 diff changeset	240 case WWT_TEXT: {
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	241 const StringID str = wi->data;
6278 b57f385b355c (svn r9088) -Add : a new type of widget, called WWT_TEXT. It is a simple truncated string. It will be usefull on windows where lot of simple text is always drawn on the WE_PAINT event, making the code clearer. For now, left, right (total size of the window), top, color and data are necessary to use it. Maybe more features will be available soon. belugas <belugas@openttd.org> parents: 5824 diff changeset	242
b57f385b355c (svn r9088) -Add : a new type of widget, called WWT_TEXT. It is a simple truncated string. It will be usefull on windows where lot of simple text is always drawn on the WE_PAINT event, making the code clearer. For now, left, right (total size of the window), top, color and data are necessary to use it. Maybe more features will be available soon. belugas <belugas@openttd.org> parents: 5824 diff changeset	243 if (str != STR_NULL) DrawStringTruncated(r.left, r.top, str, wi->color, r.right - r.left);
b57f385b355c (svn r9088) -Add : a new type of widget, called WWT_TEXT. It is a simple truncated string. It will be usefull on windows where lot of simple text is always drawn on the WE_PAINT event, making the code clearer. For now, left, right (total size of the window), top, color and data are necessary to use it. Maybe more features will be available soon. belugas <belugas@openttd.org> parents: 5824 diff changeset	244 break;
b57f385b355c (svn r9088) -Add : a new type of widget, called WWT_TEXT. It is a simple truncated string. It will be usefull on windows where lot of simple text is always drawn on the WE_PAINT event, making the code clearer. For now, left, right (total size of the window), top, color and data are necessary to use it. Maybe more features will be available soon. belugas <belugas@openttd.org> parents: 5824 diff changeset	245 }
b57f385b355c (svn r9088) -Add : a new type of widget, called WWT_TEXT. It is a simple truncated string. It will be usefull on windows where lot of simple text is always drawn on the WE_PAINT event, making the code clearer. For now, left, right (total size of the window), top, color and data are necessary to use it. Maybe more features will be available soon. belugas <belugas@openttd.org> parents: 5824 diff changeset	246
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	247 case WWT_INSET: {
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	248 const StringID str = wi->data;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	249 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, FR_LOWERED \| FR_DARKENED);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	250
7824 7ae5bda4e8dd (svn r11374) -Codechange: Give meaning to the magical number that specifies the color of the text in a DrawString call. belugas <belugas@openttd.org> parents: 6481 diff changeset	251 if (str != STR_NULL) DrawStringTruncated(r.left + 2, r.top + 1, str, TC_FROMSTRING, r.right - r.left - 10);
8320 06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	252 break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	253 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	254
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	255 case WWT_MATRIX: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	256 int c, d, ctr;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	257 int x, amt1, amt2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	258 int color;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	259
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	260 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	261
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	262 c = GB(wi->data, 0, 8);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	263 amt1 = (wi->right - wi->left + 1) / c;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	264
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	265 d = GB(wi->data, 8, 8);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	266 amt2 = (wi->bottom - wi->top + 1) / d;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	267
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	268 color = _colour_gradient[wi->color & 0xF][6];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	269
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	270 x = r.left;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	271 for (ctr = c; ctr > 1; ctr--) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	272 x += amt1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	273 GfxFillRect(x, r.top + 1, x, r.bottom - 1, color);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	274 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	275
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	276 x = r.top;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	277 for (ctr = d; ctr > 1; ctr--) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	278 x += amt2;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	279 GfxFillRect(r.left + 1, x, r.right - 1, x, color);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	280 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	281
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	282 color = _colour_gradient[wi->color & 0xF][4];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	283
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	284 x = r.left - 1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	285 for (ctr = c; ctr > 1; ctr--) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	286 x += amt1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	287 GfxFillRect(x, r.top + 1, x, r.bottom - 1, color);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	288 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	289
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	290 x = r.top - 1;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	291 for (ctr = d; ctr > 1; ctr--) {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	292 x += amt2;
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	293 GfxFillRect(r.left + 1, x, r.right - 1, x, color);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	294 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	295
8320 06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	296 break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	297 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	298
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	299 /* vertical scrollbar */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	300 case WWT_SCROLLBAR: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	301 Point pt;
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	302 int c1, c2;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	303
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	304 assert(wi->data == 0);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	305 assert(r.right - r.left == 11); // XXX - to ensure the same sizes are used everywhere!
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	306
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	307 /* draw up/down buttons */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	308 clicked = ((w->flags4 & (WF_SCROLL_UP \| WF_HSCROLL \| WF_SCROLL2)) == WF_SCROLL_UP);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	309 DrawFrameRect(r.left, r.top, r.right, r.top + 9, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
7824 7ae5bda4e8dd (svn r11374) -Codechange: Give meaning to the magical number that specifies the color of the text in a DrawString call. belugas <belugas@openttd.org> parents: 6481 diff changeset	310 DoDrawString(UPARROW, r.left + 2 + clicked, r.top + clicked, TC_BLACK);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	311
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	312 clicked = (((w->flags4 & (WF_SCROLL_DOWN \| WF_HSCROLL \| WF_SCROLL2)) == WF_SCROLL_DOWN));
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	313 DrawFrameRect(r.left, r.bottom - 9, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
7824 7ae5bda4e8dd (svn r11374) -Codechange: Give meaning to the magical number that specifies the color of the text in a DrawString call. belugas <belugas@openttd.org> parents: 6481 diff changeset	314 DoDrawString(DOWNARROW, r.left + 2 + clicked, r.bottom - 9 + clicked, TC_BLACK);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	315
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	316 c1 = _colour_gradient[wi->color & 0xF][3];
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	317 c2 = _colour_gradient[wi->color & 0xF][7];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	318
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	319 /* draw "shaded" background */
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	320 GfxFillRect(r.left, r.top + 10, r.right, r.bottom - 10, c2);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	321 GfxFillRect(r.left, r.top + 10, r.right, r.bottom - 10, c1 \| (1 << PALETTE_MODIFIER_GREYOUT));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	322
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	323 /* draw shaded lines */
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	324 GfxFillRect(r.left + 2, r.top + 10, r.left + 2, r.bottom - 10, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	325 GfxFillRect(r.left + 3, r.top + 10, r.left + 3, r.bottom - 10, c2);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	326 GfxFillRect(r.left + 7, r.top + 10, r.left + 7, r.bottom - 10, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	327 GfxFillRect(r.left + 8, r.top + 10, r.left + 8, r.bottom - 10, c2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	328
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	329 pt = HandleScrollbarHittest(&w->vscroll, r.top, r.bottom);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	330 DrawFrameRect(r.left, pt.x, r.right, pt.y, wi->color, (w->flags4 & (WF_SCROLL_MIDDLE \| WF_HSCROLL \| WF_SCROLL2)) == WF_SCROLL_MIDDLE ? FR_LOWERED : FR_NONE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	331 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	332 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	333 case WWT_SCROLL2BAR: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	334 Point pt;
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	335 int c1, c2;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	336
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	337 assert(wi->data == 0);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	338 assert(r.right - r.left == 11); // XXX - to ensure the same sizes are used everywhere!
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	339
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	340 /* draw up/down buttons */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	341 clicked = ((w->flags4 & (WF_SCROLL_UP \| WF_HSCROLL \| WF_SCROLL2)) == (WF_SCROLL_UP \| WF_SCROLL2));
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	342 DrawFrameRect(r.left, r.top, r.right, r.top + 9, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
7824 7ae5bda4e8dd (svn r11374) -Codechange: Give meaning to the magical number that specifies the color of the text in a DrawString call. belugas <belugas@openttd.org> parents: 6481 diff changeset	343 DoDrawString(UPARROW, r.left + 2 + clicked, r.top + clicked, TC_BLACK);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	344
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	345 clicked = ((w->flags4 & (WF_SCROLL_DOWN \| WF_HSCROLL \| WF_SCROLL2)) == (WF_SCROLL_DOWN \| WF_SCROLL2));
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	346 DrawFrameRect(r.left, r.bottom - 9, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
7824 7ae5bda4e8dd (svn r11374) -Codechange: Give meaning to the magical number that specifies the color of the text in a DrawString call. belugas <belugas@openttd.org> parents: 6481 diff changeset	347 DoDrawString(DOWNARROW, r.left + 2 + clicked, r.bottom - 9 + clicked, TC_BLACK);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	348
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	349 c1 = _colour_gradient[wi->color & 0xF][3];
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	350 c2 = _colour_gradient[wi->color & 0xF][7];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	351
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	352 /* draw "shaded" background */
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	353 GfxFillRect(r.left, r.top + 10, r.right, r.bottom - 10, c2);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	354 GfxFillRect(r.left, r.top + 10, r.right, r.bottom - 10, c1 \| (1 << PALETTE_MODIFIER_GREYOUT));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	355
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	356 /* draw shaded lines */
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	357 GfxFillRect(r.left + 2, r.top + 10, r.left + 2, r.bottom - 10, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	358 GfxFillRect(r.left + 3, r.top + 10, r.left + 3, r.bottom - 10, c2);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	359 GfxFillRect(r.left + 7, r.top + 10, r.left + 7, r.bottom - 10, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	360 GfxFillRect(r.left + 8, r.top + 10, r.left + 8, r.bottom - 10, c2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	361
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	362 pt = HandleScrollbarHittest(&w->vscroll2, r.top, r.bottom);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	363 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) ? FR_LOWERED : FR_NONE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	364 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	365 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	366
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	367 /* horizontal scrollbar */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	368 case WWT_HSCROLLBAR: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	369 Point pt;
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	370 int c1, c2;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	371
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	372 assert(wi->data == 0);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	373 assert(r.bottom - r.top == 11); // XXX - to ensure the same sizes are used everywhere!
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	374
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	375 clicked = ((w->flags4 & (WF_SCROLL_UP \| WF_HSCROLL)) == (WF_SCROLL_UP \| WF_HSCROLL));
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	376 DrawFrameRect(r.left, r.top, r.left + 9, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5587 diff changeset	377 DrawSprite(SPR_ARROW_LEFT, PAL_NONE, r.left + 1 + clicked, r.top + 1 + clicked);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	378
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	379 clicked = ((w->flags4 & (WF_SCROLL_DOWN \| WF_HSCROLL)) == (WF_SCROLL_DOWN \| WF_HSCROLL));
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	380 DrawFrameRect(r.right - 9, r.top, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5587 diff changeset	381 DrawSprite(SPR_ARROW_RIGHT, PAL_NONE, r.right - 8 + clicked, r.top + 1 + clicked);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	382
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	383 c1 = _colour_gradient[wi->color & 0xF][3];
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	384 c2 = _colour_gradient[wi->color & 0xF][7];
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	385
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	386 /* draw "shaded" background */
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	387 GfxFillRect(r.left + 10, r.top, r.right - 10, r.bottom, c2);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	388 GfxFillRect(r.left + 10, r.top, r.right - 10, r.bottom, c1 \| (1 << PALETTE_MODIFIER_GREYOUT));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	389
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	390 /* draw shaded lines */
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	391 GfxFillRect(r.left + 10, r.top + 2, r.right - 10, r.top + 2, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	392 GfxFillRect(r.left + 10, r.top + 3, r.right - 10, r.top + 3, c2);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	393 GfxFillRect(r.left + 10, r.top + 7, r.right - 10, r.top + 7, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	394 GfxFillRect(r.left + 10, r.top + 8, r.right - 10, r.top + 8, c2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	395
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	396 /* draw actual scrollbar */
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	397 pt = HandleScrollbarHittest(&w->hscroll, r.left, r.right);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	398 DrawFrameRect(pt.x, r.top, pt.y, r.bottom, wi->color, (w->flags4 & (WF_SCROLL_MIDDLE \| WF_HSCROLL)) == (WF_SCROLL_MIDDLE \| WF_HSCROLL) ? FR_LOWERED : FR_NONE);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	399
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	400 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	401 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	402
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	403 case WWT_FRAME: {
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	404 const StringID str = wi->data;
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	405 int c1, c2;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	406 int x2 = r.left; // by default the left side is the left side of the widget
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	407
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	408 if (str != STR_NULL) x2 = DrawString(r.left + 6, r.top, str, TC_FROMSTRING);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	409
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	410 c1 = _colour_gradient[wi->color][3];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	411 c2 = _colour_gradient[wi->color][7];
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	412
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	413 /* Line from upper left corner to start of text */
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	414 GfxFillRect(r.left, r.top + 4, r.left + 4, r.top + 4, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	415 GfxFillRect(r.left + 1, r.top + 5, r.left + 4, r.top + 5, c2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	416
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	417 /* Line from end of text to upper right corner */
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	418 GfxFillRect(x2, r.top + 4, r.right - 1, r.top + 4, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	419 GfxFillRect(x2, r.top + 5, r.right - 2, r.top + 5, c2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	420
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	421 /* Line from upper left corner to bottom left corner */
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	422 GfxFillRect(r.left, r.top + 5, r.left, r.bottom - 1, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	423 GfxFillRect(r.left + 1, r.top + 6, r.left + 1, r.bottom - 2, c2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	424
6432 fc703c6dc92c (svn r9568) -Documentation: doxygen and comment changes: Root of src is finally done. Now, time to start clearing as much as possible belugas <belugas@openttd.org> parents: 6278 diff changeset	425 /Line from upper right corner to bottom right corner /
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	426 GfxFillRect(r.right - 1, r.top + 5, r.right - 1, r.bottom - 2, c1);
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	427 GfxFillRect(r.right, r.top + 4, r.right, r.bottom - 1, c2);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	428
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	429 GfxFillRect(r.left + 1, r.bottom - 1, r.right - 1, r.bottom - 1, c1);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	430 GfxFillRect(r.left, r.bottom, r.right, r.bottom, c2);
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	431
8320 06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	432 break;
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	433 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	434
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	435 case WWT_STICKYBOX: {
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	436 assert(wi->data == 0);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	437 assert(r.right - r.left == 11); // XXX - to ensure the same sizes are used everywhere!
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	438
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	439 clicked = !!(w->flags4 & WF_STICKY);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	440 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5587 diff changeset	441 DrawSprite((clicked) ? SPR_PIN_UP : SPR_PIN_DOWN, PAL_NONE, r.left + 2 + clicked, r.top + 3 + clicked);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	442 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	443 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	444
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	445 case WWT_RESIZEBOX: {
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	446 assert(wi->data == 0);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	447 assert(r.right - r.left == 11); // XXX - to ensure the same sizes are used everywhere!
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	448
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	449 clicked = !!(w->flags4 & WF_SIZING);
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	450 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, (clicked) ? FR_LOWERED : FR_NONE);
5668 3d6d9bff3dd8 (svn r8128) -Codechange: Split sprite and palette remap into separate 32 bit values. peter1138 <peter1138@openttd.org> parents: 5587 diff changeset	451 DrawSprite(SPR_WINDOW_RESIZE, PAL_NONE, r.left + 3 + clicked, r.top + 3 + clicked);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	452 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	453 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	454
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	455 case WWT_CLOSEBOX: {
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	456 const StringID str = wi->data;
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	457
0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	458 assert(str == STR_00C5 \|\| str == STR_00C6); // black or silver cross
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	459 assert(r.right - r.left == 10); // ensure the same sizes are used everywhere
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	460
5587 c44c070c5032 (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium <rubidium@openttd.org> parents: 5584 diff changeset	461 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, FR_NONE);
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	462 DrawString(r.left + 2, r.top + 2, str, TC_FROMSTRING);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	463 break;
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	464 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	465
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	466 case WWT_CAPTION: {
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	467 assert(r.bottom - r.top == 13); // XXX - to ensure the same sizes are used everywhere!
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	468 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, FR_BORDERONLY);
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	469 DrawFrameRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, wi->color, (w->caption_color == 0xFF) ? FR_LOWERED \| FR_DARKENED : FR_LOWERED \| FR_DARKENED \| FR_BORDERONLY);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	470
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	471 if (w->caption_color != 0xFF) {
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	472 GfxFillRect(r.left + 2, r.top + 2, r.right - 2, r.bottom - 2, _colour_gradient[_player_colors[w->caption_color]][4]);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	473 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	474
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	475 DrawStringCenteredTruncated(r.left + 2, r.right - 2, r.top + 2, wi->data, 0x84);
8320 06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	476 break;
06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	477 }
8335 5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	478
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	479 case WWT_DROPDOWN: {
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	480 assert(r.bottom - r.top == 11); // ensure consistent size
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	481
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	482 StringID str = wi->data;
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	483 DrawFrameRect(r.left, r.top, r.right - 12, r.bottom, wi->color, FR_NONE);
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	484 DrawFrameRect(r.right - 11, r.top, r.right, r.bottom, wi->color, clicked ? FR_LOWERED : FR_NONE);
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	485 DrawString(r.right - (clicked ? 8 : 9), r.top + (clicked ? 2 : 1), STR_0225, TC_BLACK);
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	486 if (str != STR_NULL) DrawStringTruncated(r.left + 2, r.top + 1, str, TC_BLACK, r.right - r.left - 12);
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	487 break;
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	488 }
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	489
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	490 case WWT_DROPDOWNIN: {
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	491 assert(r.bottom - r.top == 11); // ensure consistent size
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	492
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	493 StringID str = wi->data;
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	494 DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, FR_LOWERED \| FR_DARKENED);
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	495 DrawFrameRect(r.right - 11, r.top + 1, r.right - 1, r.bottom - 1, wi->color, clicked ? FR_LOWERED : FR_NONE);
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	496 DrawString(r.right - (clicked ? 8 : 9), r.top + (clicked ? 2 : 1), STR_0225, TC_BLACK);
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	497 if (str != STR_NULL) DrawStringTruncated(r.left + 2, r.top + 2, str, TC_BLACK, r.right - r.left - 12);
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	498 break;
5d87abba6871 (svn r11901) -Add: add two widgets for dropdowns, one raised and one inset, to eventually replace use of two widgets for each dropdown control. peter1138 <peter1138@openttd.org> parents: 8320 diff changeset	499 }
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	500 }
8320 06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	501
06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	502 if (w->IsWidgetDisabled(i)) {
06495654aee6 (svn r11885) -Cleanup: Remove gotos from widget drawing code. A side affect is that it is now possible for any widget type to be shown disabled. peter1138 <peter1138@openttd.org> parents: 8284 diff changeset	503 GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, _colour_gradient[wi->color & 0xF][2] \| (1 << PALETTE_MODIFIER_GREYOUT));
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	504 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	505 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	506
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	507
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	508 if (w->flags4 & WF_WHITE_BORDER_MASK) {
7962 0fcca1a5847f (svn r11518) -Codechange: enforce (by assert) unused parameters of widgets to be zero. Better readability of DrawWindowWidgets(), too smatz <smatz@openttd.org> parents: 7928 diff changeset	509 DrawFrameRect(0, 0, w->width - 1, w->height - 1, 0xF, FR_BORDERONLY);
5584 4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	510 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	511
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	512 }
4b26bd55bd24 (svn r8033) [cpp] - Prepare for merge from branches/cpp (all .c files renamed to .cpp) KUDr <KUDr@openttd.org> parents: diff changeset	513
5824 19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	514 static void ResizeWidgets(Window *w, byte a, byte b)
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	515 {
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	516 int16 offset = w->widget[a].left;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	517 int16 length = w->widget[b].right - offset;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	518
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	519 w->widget[a].right = (length / 2) + offset;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	520
5822 3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	521 w->widget[b].left = w->widget[a].right + 1;
3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	522 }
3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	523
5824 19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	524 static void ResizeWidgets(Window *w, byte a, byte b, byte c)
5822 3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	525 {
5824 19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	526 int16 offset = w->widget[a].left;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	527 int16 length = w->widget[c].right - offset;
5822 3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	528
5824 19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	529 w->widget[a].right = length / 3;
5822 3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	530 w->widget[b].right = w->widget[a].right * 2;
3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	531
5824 19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	532 w->widget[a].right += offset;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	533 w->widget[b].right += offset;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	534
5822 3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	535 /* Now the right side of the buttons are set. We will now set the left sides next to them */
3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	536 w->widget[b].left = w->widget[a].right + 1;
3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	537 w->widget[c].left = w->widget[b].right + 1;
3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	538 }
3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	539
5824 19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	540 /** Evenly distribute some widgets when resizing horizontally (often a button row)
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	541 * When only two arguments are given, the widgets are presumed to be on a line and only the ends are given
6481 85a1a79387a2 (svn r9662) -Documentation: Doxygen corrections and @file omissions belugas <belugas@openttd.org> parents: 6432 diff changeset	542 * @param w Window to modify
5824 19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	543 * @param left The leftmost widget to resize
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	544 * @param right The rightmost widget to resize. Since right side of it is used, remember to set it to RESIZE_RIGHT
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	545 */
5822 3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	546 void ResizeButtons(Window *w, byte left, byte right)
3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	547 {
5824 19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	548 int16 num_widgets = right - left + 1;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	549
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	550 if (num_widgets < 2) NOT_REACHED();
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	551
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	552 switch (num_widgets) {
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	553 case 2: ResizeWidgets(w, left, right); break;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	554 case 3: ResizeWidgets(w, left, left + 1, right); break;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	555 default: {
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	556 /* Looks like we got more than 3 widgets to resize
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	557 * Now we will find the middle of the space desinated for the widgets
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	558 * and place half of the widgets on each side of it and call recursively.
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	559 * Eventually we will get down to blocks of 2-3 widgets and we got code to handle those cases */
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	560 int16 offset = w->widget[left].left;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	561 int16 length = w->widget[right].right - offset;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	562 byte widget = ((num_widgets - 1)/ 2) + left; // rightmost widget of the left side
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	563
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	564 /* Now we need to find the middle of the widgets.
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	565 * It will not always be the middle because if we got an uneven number of widgets,
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	566 * we will need it to be 2/5, 3/7 and so on
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	567 * To get this, we multiply with num_widgets/num_widgets. Since we calculate in int, we will get:
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	568 *
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	569 * num_widgets/2 (rounding down)
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	570 * ---------------
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	571 * num_widgets
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	572 *
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	573 * as multiplier to length. We just multiply before divide to that we stay in the int area though */
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	574 int16 middle = ((length * num_widgets) / (2 * num_widgets)) + offset;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	575
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	576 /* Set left and right on the widgets, that's next to our "middle" */
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	577 w->widget[widget].right = middle;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	578 w->widget[widget + 1].left = w->widget[widget].right + 1;
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	579 /* Now resize the left and right of the middle */
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	580 ResizeButtons(w, left, widget);
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	581 ResizeButtons(w, widget + 1, right);
19c4635a0be0 (svn r8390) -Codechange (r8384): Rewrote ResizeButtons() bjarni <bjarni@openttd.org> parents: 5822 diff changeset	582 }
5822 3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	583 }
3d41b8b9b76e (svn r8384) -Codechange: [GUI] instead of writing a resize button function for each window, a global ResizeButtons() is added bjarni <bjarni@openttd.org> parents: 5668 diff changeset	584 }
8349 cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	585
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	586 /** Draw a sort button's up or down arrow symbol.
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	587 * @param w Window of widget
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	588 * @param widget Sort button widget
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	589 * @param state State of sort button
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	590 */
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	591 void DrawSortButtonState(const Window *w, int widget, SortButtonState state)
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	592 {
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	593 if (state == SBS_OFF) return;
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	594
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	595 int offset = w->IsWidgetLowered(widget) ? 1 : 0;
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	596 DoDrawString(state == SBS_DOWN ? DOWNARROW : UPARROW, w->widget[widget].right - 11 + offset, w->widget[widget].top + 1 + offset, TC_BLACK);
cbb2e614bcfa (svn r11915) -Codechange: Add a function to draw a sort button's up/down arrow. Arrows are now drawn in a consistent position based on the widget, instead of randomly positioned by pixel. peter1138 <peter1138@openttd.org> parents: 8335 diff changeset	597 }

Mercurial > hg > openttd

annotate src/widget.cpp @ 8411:e0420e29320d draft