openttd-mini: comparison widget.c

equal deleted inserted replaced

-:614bba52258d
+:0a7025304867
 	Point pt;
 	int height, count, pos, cap;
 	top += 10;
 	bottom -= 9;
 	height = (bottom - top);
 	pos = sb->pos;
 	count = sb->count;
 	cap = sb->cap;
 	if (count != 0)	top += height * pos / count;
 	if (cap > count) cap = count;
 	if (count != 0)
 		bottom -= (count - pos - cap) * height / count;
 	pt.x = top;
 		mi = wi->left;
 		ma = wi->right;
 		pos = x;
 		sb = &w->hscroll;
 	}
 	if (pos <= mi+9) {
 		// Pressing the upper button?
 		if (!_demo_mode) {
 			w->flags4 |= WF_SCROLL_UP;
 			if (_scroller_click_timeout == 0) {
 		}
 	} else if (pos >= ma-10) {
 		// Pressing the lower button?
 		if (!_demo_mode) {
 			w->flags4 |= WF_SCROLL_DOWN;
 			if (_scroller_click_timeout == 0) {
 				_scroller_click_timeout = 6;
 				if ((byte)(sb->pos + sb->cap) < sb->count)
 					sb->pos++;
 			}
 			_left_button_clicked = false;
 		}
 	} else {
 		//
 		Point pt = HandleScrollbarHittest(sb, mi, ma);
 		if (pos < pt.x) {
 			sb->pos = max(sb->pos - sb->cap, 0);
 		} else if (pos > pt.y) {
 			sb->pos = min(
 				sb->pos + sb->cap,
 				max(sb->count - sb->cap, 0)
 			);
 		} else {
 			_scrollbar_start_pos = pt.x - mi - 9;
 			_scrollbar_size = ma - mi - 23;
 	const Widget *wi;
 	DrawPixelInfo *dpi = _cur_dpi;
 	Rect r;
 	uint32 dparam_backup[10];
 	uint32 cur_click, cur_disabled, cur_hidden;
 	if (w->desc_flags & WDF_RESTORE_DPARAM)	COPY_OUT_DPARAM(dparam_backup, 0, lengthof(dparam_backup));
 	wi = w->widget;
 	cur_click = w->click_state;
 	cur_disabled = w->disabled_state;
 	cur_hidden = w->hidden_state;
 		case WWT_5: {
 			StringID str = wi->unkA;
 			if ((wi->type&WWT_MASK) == WWT_4 && (cur_click&1)) str++;
 			DrawStringCentered((r.left + r.right+1)>>1, ((r.top+r.bottom + 1)>>1) - 5, str, 0);
 			goto restore_dparam;
 		}
 		case WWT_6: {
 			}
 			goto draw_default;
 		}
 		case WWT_MATRIX: {
 			int c, d, ctr;
 			int x, amt1, amt2;
 			int color;
 			DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color,
 					(cur_click & 1) ? 0x20 : 0);
 			c = (wi->unkA&0xFF);
 			amt1 = (wi->right - wi->left + 1) / c;
 			d = (wi->unkA >> 8);
 			amt2 = (wi->bottom - wi->top + 1) / d;
 			color = _color_list[wi->color&0xF].window_color_bgb;
 			x = r.left;
 			for(ctr=c; --ctr; ) {
 				x += amt1;
 				GfxFillRect(x, r.top+1, x, r.bottom-1, color);
 			}
 			for(ctr=d; --ctr; ) {
 				x += amt2;
 				GfxFillRect(r.left+1, x, r.right-1, x, color);
 			}
 			goto draw_default;
 		}
 		// vertical scrollbar
 		case WWT_SCROLLBAR: {
 			Point pt;
 			// draw shaded lines
 			GfxFillRect(r.left+2, r.top+10, r.left+2, r.bottom-10, c1);
 			GfxFillRect(r.left+3, r.top+10, r.left+3, r.bottom-10, c2);
 			GfxFillRect(r.left+7, r.top+10, r.left+7, r.bottom-10, c1);
 			GfxFillRect(r.left+8, r.top+10, r.left+8, r.bottom-10, c2);
 			pt = HandleScrollbarHittest(&w->vscroll, r.top, r.bottom);
 			DrawFrameRect(r.left, pt.x, r.right, pt.y, wi->color, (w->flags4 & (WF_SCROLL_MIDDLE | WF_HSCROLL)) == WF_SCROLL_MIDDLE ? 0x20 : 0);
 			break;
 		}
 		}
 		case WWT_CAPTION: {
 			DrawFrameRect(r.left, r.top, r.right, r.bottom, wi->color, 0x10);
 			DrawFrameRect(r.left+1, r.top+1, r.right-1, r.bottom-1, wi->color, (w->caption_color == 0xFF) ? 0x60 : 0x70);
 			if (w->caption_color != 0xFF) {
 				GfxFillRect(r.left+2, r.top+2, r.right-2, r.bottom-2, _color_list[_player_colors[w->caption_color]].window_color_1b);
 			}
 			DrawStringCentered( (r.left+r.right+1)>>1, r.top+2, wi->unkA, 0x84);
 				GfxFillRect(r.left+1, r.top+1, r.right-1, r.bottom-1, _color_list[wi->color&0xF].unk2 | 0x8000);
 			}
 		}
 		}
 	} while (cur_click>>=1, cur_disabled>>=1, cur_hidden >>= 1, (++wi)->type != WWT_LAST);
 	if (w->flags4 & WF_WHITE_BORDER_MASK) {
 		//DrawFrameRect(w->left, w->top, w->left + w->width-1, w->top+w->height-1, 0xF, 0x10);
 		DrawFrameRect(0, 0, w->width-1, w->height-1, 0xF, 0x10);
 	}
 	uint item;
 	int y;
 	if (GetWidgetFromPos(w, _cursor.pos.x - w->left, _cursor.pos.y - w->top) < 0)
 		return -1;
 	y = _cursor.pos.y - w->top - 2;
 	if (y < 0)
 		return - 1;
 					GfxFillRect(x+1, y, x+w->width-4, y + 9, 0);
 				}
 				DrawString(x+2, y, _dropdown_items[i], sel==0 ? 12 : 16);
 				if (dis & 1) {
 					GfxFillRect(x, y, x+w->width-3, y + 9, 0x8000 +
 						_color_list[_dropdown_menu_widgets[0].color].window_color_bga);
 				}
 			} else {
 				int color_1 = _color_list[_dropdown_menu_widgets[0].color].window_color_1a;
 				int color_2 = _color_list[_dropdown_menu_widgets[0].color].window_color_2;
 			_dropdown_selindex = item;
 			SetWindowDirty(w);
 		}
 	} break;
 	case WE_DESTROY: {
 		Window *w2 = FindWindowById(_dropdown_windowclass, _dropdown_windownum);
 		if (w2 != NULL) {
 			CLRBIT(w2->click_state, _dropdown_button);
 			InvalidateWidget(w2, _dropdown_button);
 	WindowClass cls;
 	int i,t1,t2;
 	const Widget *wi;
 	Window *w2;
 	uint32 old_click_state = w->click_state;
 	_dropdown_disabled = disabled_mask;
 	cls = w->window_class;
 	num = w->window_number;
 	DeleteWindowById(WC_DROPDOWN_MENU, 0);
 		return;
 	SETBIT(w->click_state, button);
 	InvalidateWidget(w, button);
 	for(i=0;strings[i] != INVALID_STRING_ID;i++);
 	if (i == 0)
 		return;
 	_dropdown_items = strings;
 	_dropdown_item_count = i;
 	_dropdown_selindex = selected;
 	_dropdown_windowclass = w->window_class;
 	_dropdown_windownum = w->window_number;
 	_dropdown_button = button;
 	_dropdown_var1 = 0;
 	_dropdown_var2 = 1;
 	wi = &w->widget[button];
 	_dropdown_menu_widgets[0].color = wi->color;
 	w2 = AllocateWindow(
 		w->left + wi[-1].left + 1,
 		w->top + wi->bottom + 2,
 		(_dropdown_menu_widgets[0].right=t1=wi->right - wi[-1].left, t1 + 1),
 		(_dropdown_menu_widgets[0].bottom=t2=i*10+3, t2+1),
 		DropdownMenuWndProc,
 		0x3F,
 		_dropdown_menu_widgets);

changeset 193	0a7025304867
parent 176	84990c4b9212
child 507	04b5403aaf6b