[nexuiz-commits] r8191 - in trunk/data/qcsrc/menu: . item nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Oct 30 14:32:28 EDT 2009
Author: div0
Date: 2009-10-30 14:32:28 -0400 (Fri, 30 Oct 2009)
New Revision: 8191
Modified:
trunk/data/qcsrc/menu/item/listbox.c
trunk/data/qcsrc/menu/nexuiz/listbox.c
trunk/data/qcsrc/menu/nexuiz/maplist.c
trunk/data/qcsrc/menu/skin-customizables.inc
Log:
Listbox background by Samual, edited by me (1)
Modified: trunk/data/qcsrc/menu/item/listbox.c
===================================================================
--- trunk/data/qcsrc/menu/item/listbox.c 2009-10-30 18:29:12 UTC (rev 8190)
+++ trunk/data/qcsrc/menu/item/listbox.c 2009-10-30 18:32:28 UTC (rev 8191)
@@ -32,6 +32,8 @@
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 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);
Modified: trunk/data/qcsrc/menu/nexuiz/listbox.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/listbox.c 2009-10-30 18:29:12 UTC (rev 8190)
+++ trunk/data/qcsrc/menu/nexuiz/listbox.c 2009-10-30 18:32:28 UTC (rev 8191)
@@ -11,6 +11,8 @@
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
Modified: trunk/data/qcsrc/menu/nexuiz/maplist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/maplist.c 2009-10-30 18:29:12 UTC (rev 8190)
+++ trunk/data/qcsrc/menu/nexuiz/maplist.c 2009-10-30 18:32:28 UTC (rev 8191)
@@ -41,6 +41,8 @@
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);
Modified: trunk/data/qcsrc/menu/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu/skin-customizables.inc 2009-10-30 18:29:12 UTC (rev 8190)
+++ trunk/data/qcsrc/menu/skin-customizables.inc 2009-10-30 18:32:28 UTC (rev 8191)
@@ -167,6 +167,8 @@
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');
More information about the nexuiz-commits
mailing list