From fe7f859cf371146657fe4fa7c56b56c6079d08cc Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 30 Oct 2009 18:32:28 +0000 Subject: [PATCH] Listbox background by Samual, edited by me (1) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8191 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/menu/item/listbox.c | 7 ++++++- data/qcsrc/menu/nexuiz/listbox.c | 2 ++ data/qcsrc/menu/nexuiz/maplist.c | 2 ++ data/qcsrc/menu/skin-customizables.inc | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/menu/item/listbox.c b/data/qcsrc/menu/item/listbox.c index 3ebbf6093..98af5e138 100644 --- a/data/qcsrc/menu/item/listbox.c +++ b/data/qcsrc/menu/item/listbox.c @@ -32,6 +32,8 @@ CLASS(ListBox) EXTENDS(Item) ATTRIB(ListBox, scrollbarWidth, float, 0) // pixels ATTRIB(ListBox, nItems, float, 42) ATTRIB(ListBox, itemHeight, float, 0) + ATTRIB(ListBox, colorBG, vector, '0 0 0') + ATTRIB(ListBox, alphaBG, float, 0) METHOD(ListBox, drawListBoxItem, void(entity, float, vector, float)) // item number, width/height, selected METHOD(ListBox, clickListBoxItem, void(entity, float, vector)) // item number, relative clickpos METHOD(ListBox, setSelected, void(entity, float)) @@ -239,11 +241,14 @@ void updateControlTopBottomListBox(entity me) void drawListBox(entity me) { float i; - vector absSize; + vector absSize, fillSize; vector oldshift, oldscale; if(me.pressed == 2) me.mouseDrag(me, me.dragScrollPos); // simulate mouseDrag event me.updateControlTopBottom(me); + fillSize_x = (1 - me.controlWidth); + if(me.alphaBG) + draw_Fill('0 0 0', '0 1 0' + fillSize, me.colorBG, me.alphaBG); if(me.controlWidth) { draw_VertButtonPicture(eX * (1 - me.controlWidth), strcat(me.src, "_s"), eX * me.controlWidth + eY, me.color2, 1); diff --git a/data/qcsrc/menu/nexuiz/listbox.c b/data/qcsrc/menu/nexuiz/listbox.c index 0abd655f5..ef52087db 100644 --- a/data/qcsrc/menu/nexuiz/listbox.c +++ b/data/qcsrc/menu/nexuiz/listbox.c @@ -11,6 +11,8 @@ CLASS(NexuizListBox) EXTENDS(ListBox) ATTRIB(NexuizListBox, colorF, vector, SKINCOLOR_SCROLLBAR_F) ATTRIB(NexuizListBox, color2, vector, SKINCOLOR_SCROLLBAR_S) ATTRIB(NexuizListBox, colorC, vector, SKINCOLOR_SCROLLBAR_C) + ATTRIB(NexuizListBox, colorBG, vector, SKINCOLOR_LISTBOX_BACKGROUND) + ATTRIB(NexuizListBox, alphaBG, float, SKINALPHA_LISTBOX_BACKGROUND) ENDCLASS(NexuizListBox) entity makeNexuizListBox(); #endif diff --git a/data/qcsrc/menu/nexuiz/maplist.c b/data/qcsrc/menu/nexuiz/maplist.c index de73d7829..3d187b903 100644 --- a/data/qcsrc/menu/nexuiz/maplist.c +++ b/data/qcsrc/menu/nexuiz/maplist.c @@ -41,6 +41,8 @@ CLASS(NexuizMapList) EXTENDS(NexuizListBox) ATTRIB(NexuizMapList, typeToSearchTime, float, 0) METHOD(NexuizMapList, destroy, void(entity)) + + ATTRIB(NexuizListBox, alphaBG, float, 0) ENDCLASS(NexuizMapList) entity makeNexuizMapList(); void MapList_All(entity btn, entity me); diff --git a/data/qcsrc/menu/skin-customizables.inc b/data/qcsrc/menu/skin-customizables.inc index a035a3e95..c27e3b5e9 100644 --- a/data/qcsrc/menu/skin-customizables.inc +++ b/data/qcsrc/menu/skin-customizables.inc @@ -167,6 +167,8 @@ SKINBEGIN SKINFLOAT(ALPHA_LISTBOX_SELECTED, 0.5); SKINVECTOR(COLOR_LISTBOX_WAITING, '1 0 0'); SKINFLOAT(ALPHA_LISTBOX_WAITING, 0.5); + SKINVECTOR(COLOR_LISTBOX_BACKGROUND, '0 0 0'); + SKINFLOAT(ALPHA_LISTBOX_BACKGROUND, 0.5); // item: map list SKINVECTOR(COLOR_MAPLIST_TITLE, '1 1 1'); -- 2.39.2