Make the mapvote panel less horizontally stretched: reduce a bit available width...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / mapvoting.qc

diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc
index 05b01c5c137023d79f3f1c11e96c0028bb25079a..77fd31a089ae114ca6aba4c3ebe649c8ce5b841e 100644 (file)
--- a/qcsrc/client/mapvoting.qc
+++ b/qcsrc/client/mapvoting.qc
@@ -90,10 +90,10 @@ void GameTypeVote_DrawGameTypeItem(vector pos, float maxh, float tsize, string g
        // Bounding box details
        float rect_margin = hud_fontsize.y / 2;
 
-       pos.x += rect_margin;
-       pos.y += rect_margin;
-       maxh -= 2 * rect_margin;
-       tsize -= 2 * rect_margin;
+       pos.x += rect_margin + autocvar_scoreboard_border_thickness;
+       pos.y += rect_margin + autocvar_scoreboard_border_thickness;
+       maxh -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
+       tsize -= 2 * (rect_margin + autocvar_scoreboard_border_thickness);
 
        vector rect_pos = pos - '0.5 0.5 0' * rect_margin;
        vector rect_size = '1 1 0';
@@ -312,12 +312,11 @@ void MapVote_Draw()
        int i;
        float tmp;
        vector pos;
-       float isize;
        float center;
        float rows;
-       float tsize;
        vector dist = '0 0 0';
 
+       //if(intermission != 2) return;
        if(!mv_active)
                return;
 
@@ -334,14 +333,15 @@ void MapVote_Draw()
        }
 
        center = (vid_conwidth - 1)/2;
-       xmin = vid_conwidth*0.05; // 5% border must suffice
+       xmin = vid_conwidth * 0.08;
        xmax = vid_conwidth - xmin;
        ymin = 20;
-       i = autocvar_con_chatpos; // *autocvar_con_chatsize;
-       if(i < 0)
-               ymax = vid_conheight + (i - autocvar_con_chat) * autocvar_con_chatsize;
-       if(i >= 0 || ymax < (vid_conheight*0.5))
-               ymax = vid_conheight - ymin;
+       ymax = vid_conheight - ymin;
+
+       if(chat_posy + chat_sizey / 2 < vid_conheight / 2)
+               ymin += chat_sizey;
+       else
+               ymax -= chat_sizey;
 
        hud_fontsize = HUD_GetFontsize("hud_fontsize");
 
@@ -349,30 +349,44 @@ void MapVote_Draw()
        pos.z = 0;
 
        draw_beginBoldFont();
+
        map = ((gametypevote) ? _("Decide the gametype") : _("Vote for a map"));
-       pos.x = center - stringwidth(map, false, '12 0 0');
-       drawstring(pos, map, '24 24 0', '1 1 1', 1, DRAWFLAG_NORMAL);
-       pos.y += 26;
+       pos.x = center - stringwidth(map, false, hud_fontsize * 2) * 0.5;
+       drawstring(pos, map, hud_fontsize * 2, '1 1 1', 1, DRAWFLAG_NORMAL);
+       pos.y += hud_fontsize.y * 2;
 
        if( mapvote_chosenmap != "" )
        {
-               pos.x = center - stringwidth(mapvote_chosenmap, false, hud_fontsize*1.5/2);
-               drawstring(pos, mapvote_chosenmap, hud_fontsize*1.5, '1 1 1', 1, DRAWFLAG_NORMAL);
-               pos.y += hud_fontsize.y*2;
+               pos.y += hud_fontsize.y * 0.25;
+               pos.x = center - stringwidth(mapvote_chosenmap, false, hud_fontsize * 1.5) * 0.5;
+               drawstring(pos, mapvote_chosenmap, hud_fontsize * 1.5, '1 1 1', 1, DRAWFLAG_NORMAL);
+               pos.y += hud_fontsize.y * 1.5;
+               pos.y += hud_fontsize.y * 0.5;
        }
+       else
+               pos.y += hud_fontsize.y * 0.5;
+
+       draw_endBoldFont();
 
        i = ceil(max(0, mv_timeout - time));
        map = sprintf(_("%d seconds left"), i);
-       pos.x = center - stringwidth(map, false, '8 0 0');
-       drawstring(pos, map, '16 16 0', '0 1 0', 1, DRAWFLAG_NORMAL);
-       pos.y += 22;
-       pos.x = xmin;
-       draw_endBoldFont();
+       pos.x = center - stringwidth(map, false, hud_fontsize * 1.5) * 0.5;
+       drawstring(pos, map, hud_fontsize * 1.5, '0 1 0', 1, DRAWFLAG_NORMAL);
+       pos.y += hud_fontsize.y * 1.5;
+       pos.y += hud_fontsize.y * 0.5;
+
+       HUD_Panel_UpdateCvars();
 
        // base for multi-column stuff...
+       pos.y += hud_fontsize.y;
+       pos.x = xmin;
        ymin = pos.y;
+       float abstain_spacing = panel_bg_border + hud_fontsize.y;
        if(mv_abstain)
+       {
                mv_num_maps -= 1;
+               ymax -= abstain_spacing;
+       }
 
        // higher than the image itself ratio for mapvote items to reserve space for long map names
        int item_aspect = (gametypevote) ? 3/1 : 5/3;
@@ -409,11 +423,26 @@ void MapVote_Draw()
        xmin = pos.x += offset;
        xmax -= offset;
        offset = ((ymax - pos.y) - dist.y * rows) / 2;
-       ymin = pos.y += offset;
-       ymax -= offset;
+       ymax -= 2 * offset;
 
-       tsize = dist.x;
-       isize = dist.y;
+       // override panel_pos and panel_size
+       panel_pos.x = pos.x;
+       panel_pos.y = pos.y;
+       panel_size.x = xmax - xmin;
+       panel_size.y = ymax - ymin;
+       HUD_Panel_DrawBg(1);
+
+       if(panel_bg_padding)
+       {
+               // FIXME item AR gets slightly changed here...
+               // it's rather hard to avoid it at this point
+               dist.x -= 2 * panel_bg_padding / mv_columns;
+               dist.y -= 2 * panel_bg_padding / rows;
+               xmin = pos.x += panel_bg_padding;
+               ymin = pos.y += panel_bg_padding;
+               xmax -= 2 * panel_bg_padding;
+               ymax -= 2 * panel_bg_padding;
+       }
 
        mv_selection = MapVote_Selection(pos, dist, rows, mv_columns);
 
@@ -432,9 +461,9 @@ void MapVote_Draw()
                tmp = mv_votes[i]; // FTEQCC bug: too many array accesses in the function call screw it up
                map = mv_maps[i];
                if(mv_preview[i])
-                       DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), isize, tsize, map, mv_pics[i], tmp, i);
+                       DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), dist.y, dist.x, map, mv_pics[i], tmp, i);
                else
-                       DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), isize, tsize, map, "", tmp, i);
+                       DrawItem(pos + MapVote_GridVec(dist, i, mv_columns), dist.y, dist.x, map, "", tmp, i);
        }
 
        if(mv_abstain)
@@ -442,9 +471,9 @@ void MapVote_Draw()
 
        if(mv_abstain && i < mv_num_maps) {
                tmp = mv_votes[i];
-               pos.y = ymax + 2 * hud_fontsize.y;
+               pos.y = ymax + abstain_spacing;
                pos.x = (xmax+xmin)*0.5;
-               MapVote_DrawAbstain(pos, isize, xmax - xmin, tmp, i);
+               MapVote_DrawAbstain(pos, dist.x, xmax - xmin, tmp, i);
        }
 
        drawpic(mv_mousepos, strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), '32 32 0', '1 1 1', 1 - autocvar__menu_alpha, DRAWFLAG_NORMAL);