Index: data/gfx/menu/blueplastic/skinvalues.txt =================================================================== --- data/gfx/menu/blueplastic/skinvalues.txt (revision 8189) +++ data/gfx/menu/blueplastic/skinvalues.txt (working copy) @@ -136,6 +136,8 @@ ALPHA_LISTBOX_SELECTED 1 COLOR_LISTBOX_WAITING '0.875 0.875 0.875' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0.5 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/default/skinvalues.txt =================================================================== --- data/gfx/menu/default/skinvalues.txt (revision 8189) +++ data/gfx/menu/default/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 0.5 COLOR_LISTBOX_WAITING '1 0 0' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0.5 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/silver/skinvalues.txt =================================================================== --- data/gfx/menu/silver/skinvalues.txt (revision 8189) +++ data/gfx/menu/silver/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 0.4 COLOR_LISTBOX_WAITING '1 0 0' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/simplygray/skinvalues.txt =================================================================== --- data/gfx/menu/simplygray/skinvalues.txt (revision 8189) +++ data/gfx/menu/simplygray/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 0.5 COLOR_LISTBOX_WAITING '1 0 0' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/wickedblack/skinvalues.txt =================================================================== --- data/gfx/menu/wickedblack/skinvalues.txt (revision 8189) +++ data/gfx/menu/wickedblack/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 1 COLOR_LISTBOX_WAITING '0.875 0.875 0.875' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0.5 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/wickedblue/skinvalues.txt =================================================================== --- data/gfx/menu/wickedblue/skinvalues.txt (revision 8189) +++ data/gfx/menu/wickedblue/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 1 COLOR_LISTBOX_WAITING '0.5 0.75 1' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0.5 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/wickedgreen/skinvalues.txt =================================================================== --- data/gfx/menu/wickedgreen/skinvalues.txt (revision 8189) +++ data/gfx/menu/wickedgreen/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 1 COLOR_LISTBOX_WAITING '0.5 1 0' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0.5 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/wickedred/skinvalues.txt =================================================================== --- data/gfx/menu/wickedred/skinvalues.txt (revision 8189) +++ data/gfx/menu/wickedred/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 1 COLOR_LISTBOX_WAITING '1 0 0' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0.5 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/wickedwhite/skinvalues.txt =================================================================== --- data/gfx/menu/wickedwhite/skinvalues.txt (revision 8189) +++ data/gfx/menu/wickedwhite/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 1 COLOR_LISTBOX_WAITING '0.875 0.875 0.875' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0.5 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/wickedyellow/skinvalues.txt =================================================================== --- data/gfx/menu/wickedyellow/skinvalues.txt (revision 8189) +++ data/gfx/menu/wickedyellow/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 1 COLOR_LISTBOX_WAITING '1 0.875 0' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0.5 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/wickedz/skinvalues.txt =================================================================== --- data/gfx/menu/wickedz/skinvalues.txt (revision 8189) +++ data/gfx/menu/wickedz/skinvalues.txt (working copy) @@ -149,6 +149,8 @@ ALPHA_LISTBOX_SELECTED 1 COLOR_LISTBOX_WAITING '0 0.35 0.35' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0.5 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/gfx/menu/xaw/skinvalues.txt =================================================================== --- data/gfx/menu/xaw/skinvalues.txt (revision 8189) +++ data/gfx/menu/xaw/skinvalues.txt (working copy) @@ -135,6 +135,8 @@ ALPHA_LISTBOX_SELECTED 1 COLOR_LISTBOX_WAITING '1 0 0' ALPHA_LISTBOX_WAITING 0.5 +COLOR_LISTBOX_BACKGROUND '0 0 0' +ALPHA_LISTBOX_BACKGROUND 0 // item: map list COLOR_MAPLIST_TITLE '1 1 1' Index: data/qcsrc/menu/item/listbox.c =================================================================== --- data/qcsrc/menu/item/listbox.c (revision 8189) +++ data/qcsrc/menu/item/listbox.c (working copy) @@ -32,6 +32,7 @@ ATTRIB(ListBox, scrollbarWidth, float, 0) // pixels ATTRIB(ListBox, nItems, float, 42) ATTRIB(ListBox, itemHeight, float, 0) + ATTRIB(ListBox, bgFill, float, 1) 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 +240,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.bgFill) + draw_Fill('0 0 0', '0 1 0' + fillSize, SKINCOLOR_LISTBOX_BACKGROUND, SKINALPHA_LISTBOX_BACKGROUND); if(me.controlWidth) { draw_VertButtonPicture(eX * (1 - me.controlWidth), strcat(me.src, "_s"), eX * me.controlWidth + eY, me.color2, 1); Index: data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c =================================================================== --- data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c (revision 8189) +++ data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c (working copy) @@ -5,8 +5,8 @@ METHOD(NexuizWeaponsDialog, showNotify, void(entity)) ATTRIB(NexuizWeaponsDialog, title, string, "Weapon settings") ATTRIB(NexuizWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS) - ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.35) - ATTRIB(NexuizWeaponsDialog, rows, float, 16) + ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.5) + ATTRIB(NexuizWeaponsDialog, rows, float, 17) ATTRIB(NexuizWeaponsDialog, columns, float, 4) ATTRIB(NexuizWeaponsDialog, weaponsList, entity, NULL) ENDCLASS(NexuizWeaponsDialog) @@ -24,34 +24,30 @@ void fillNexuizWeaponsDialog(entity me) { entity e; - float h0, h; - h = me.rows - 7; - me.TR(me); me.TD(me, 1, 4, makeNexuizTextLabel(0, "Weapon priority list:")); me.TR(me); - h0 = me.currentRow; - me.TD(me, h, 3, e = me.weaponsList = makeNexuizWeaponsList()); - me.gotoRC(me, h0 + h / 2 - 1, 3); + me.TD(me, 9, 4, e = me.weaponsList = makeNexuizWeaponsList()); + me.gotoRC(me, 10, 0); + me.TDempty(me, 1); me.TD(me, 1, 1, e = makeNexuizButton("Up", '0 0 0')); e.onClick = WeaponsList_MoveUp_Click; e.onClickEntity = me.weaponsList; - me.gotoRC(me, h0 + h / 2, 3); me.TD(me, 1, 1, e = makeNexuizButton("Down", '0 0 0')); e.onClick = WeaponsList_MoveDown_Click; e.onClickEntity = me.weaponsList; - me.gotoRC(me, h0 + h, 0); + me.gotoRC(me, 11, 0); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_weaponpriority_useforcycling", "Use priority list for weapon cycling")); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup")); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model")); me.TR(me); - me.TDempty(me, 0.5); - me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "4", "Left align")); + me.TDempty(me, 0.2); + me.TD(me, 1, 1, e = makeNexuizRadioButton(1, "cl_gunalign", "4", "Left align")); setDependent(e, "r_drawviewmodel", 1, 1); - me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "3", "Right align")); + me.TD(me, 1, 1, e = makeNexuizRadioButton(1, "cl_gunalign", "3", "Right align")); setDependent(e, "r_drawviewmodel", 1, 1); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Flip view horizontally")); @@ -60,5 +56,4 @@ e.onClick = Dialog_Close; e.onClickEntity = me; } - #endif Index: data/qcsrc/menu/nexuiz/dialog_singleplayer.c =================================================================== --- data/qcsrc/menu/nexuiz/dialog_singleplayer.c (revision 8189) +++ data/qcsrc/menu/nexuiz/dialog_singleplayer.c (working copy) @@ -66,7 +66,7 @@ me.TD(me, 1, me.columns - 2, lblTitle = makeNexuizTextLabel(0.5, "???")); me.TD(me, 1, 1, btnNext = makeNexuizButton(">>", '0 0 0')); me.TR(me); - me.TD(me, me.rows - 6, me.columns, me.campaignBox = makeNexuizCampaignList()); + me.TD(me, me.rows - 5, me.columns, me.campaignBox = makeNexuizCampaignList()); btnPrev.onClick = MultiCampaign_Prev; btnPrev.onClickEntity = me.campaignBox; btnNext.onClick = MultiCampaign_Next; Index: data/qcsrc/menu/nexuiz/maplist.c =================================================================== --- data/qcsrc/menu/nexuiz/maplist.c (revision 8189) +++ data/qcsrc/menu/nexuiz/maplist.c (working copy) @@ -66,6 +66,7 @@ { me.configureNexuizListBox(me); me.refilter(me); + me.bgFill = 0; } void loadCvarsNexuizMapList(entity me) Index: data/qcsrc/menu/skin-customizables.inc =================================================================== --- data/qcsrc/menu/skin-customizables.inc (revision 8189) +++ data/qcsrc/menu/skin-customizables.inc (working copy) @@ -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');