|
@@ -282,13 +282,13 @@ void DrawWindowWidgets(Window *w)
|
|
|
|
|
|
c1 = _color_list[wi->color&0xF].window_color_1a;
|
|
|
c2 = _color_list[wi->color&0xF].window_color_2;
|
|
|
|
|
|
// draw "shaded" background
|
|
|
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c2);
|
|
|
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c1 | 0x8000);
|
|
|
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c1 | PALETTE_MODIFIER_GREYOUT);
|
|
|
|
|
|
// 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);
|
|
@@ -314,13 +314,13 @@ void DrawWindowWidgets(Window *w)
|
|
|
|
|
|
c1 = _color_list[wi->color&0xF].window_color_1a;
|
|
|
c2 = _color_list[wi->color&0xF].window_color_2;
|
|
|
|
|
|
// draw "shaded" background
|
|
|
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c2);
|
|
|
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c1 | 0x8000);
|
|
|
GfxFillRect(r.left, r.top+10, r.right, r.bottom-10, c1 | PALETTE_MODIFIER_GREYOUT);
|
|
|
|
|
|
// 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);
|
|
@@ -347,13 +347,13 @@ void DrawWindowWidgets(Window *w)
|
|
|
|
|
|
c1 = _color_list[wi->color&0xF].window_color_1a;
|
|
|
c2 = _color_list[wi->color&0xF].window_color_2;
|
|
|
|
|
|
// draw "shaded" background
|
|
|
GfxFillRect(r.left+10, r.top, r.right-10, r.bottom, c2);
|
|
|
GfxFillRect(r.left+10, r.top, r.right-10, r.bottom, c1 | 0x8000);
|
|
|
GfxFillRect(r.left+10, r.top, r.right-10, r.bottom, c1 | PALETTE_MODIFIER_GREYOUT);
|
|
|
|
|
|
// draw shaded lines
|
|
|
GfxFillRect(r.left+10, r.top+2, r.right-10, r.top+2, c1);
|
|
|
GfxFillRect(r.left+10, r.top+3, r.right-10, r.top+3, c2);
|
|
|
GfxFillRect(r.left+10, r.top+7, r.right-10, r.top+7, c1);
|
|
|
GfxFillRect(r.left+10, r.top+8, r.right-10, r.top+8, c2);
|
|
@@ -423,13 +423,13 @@ void DrawWindowWidgets(Window *w)
|
|
|
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);
|
|
|
draw_default:;
|
|
|
if (cur_disabled & 1) {
|
|
|
GfxFillRect(r.left+1, r.top+1, r.right-1, r.bottom-1, _color_list[wi->color&0xF].unk2 | 0x8000);
|
|
|
GfxFillRect(r.left+1, r.top+1, r.right-1, r.bottom-1, _color_list[wi->color&0xF].unk2 | PALETTE_MODIFIER_GREYOUT);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
} while (cur_click>>=1, cur_disabled>>=1, cur_hidden >>= 1, (++wi)->type != WWT_LAST);
|
|
|
|
|
|
|
|
@@ -500,13 +500,13 @@ static void DropdownMenuWndProc(Window *
|
|
|
if (sel == 0) {
|
|
|
GfxFillRect(x+1, y, x+w->width-4, y + 9, 0);
|
|
|
}
|
|
|
DrawString(x+2, y, _dropdown_items[i], sel==0 ? 12 : 16);
|
|
|
|
|
|
if (HASBIT(_dropdown_disabled, i) && !_dropdown_disabled_items) {
|
|
|
GfxFillRect(x, y, x+w->width-3, y + 9, 0x8000 +
|
|
|
GfxFillRect(x, y, x+w->width-3, y + 9, PALETTE_MODIFIER_GREYOUT |
|
|
|
_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;
|
|
|
GfxFillRect(x+1, y+3, x+w->width-5, y+3, color_1);
|