New cvar hud_panel_itemstime_size_dinamic, if enabled reduces panel size by removing...

diff --git a/_hud_descriptions.cfg b/_hud_descriptions.cfg
index 499f2d508f105eb03aec871c0b078d68ab296b0e..c1d4422d4610afd568c3220d891c5ddaba7789b3 100644 (file)
--- a/_hud_descriptions.cfg
+++ b/_hud_descriptions.cfg
@@ -306,4 +306,5 @@ seta hud_panel_itemstime_progressbar_reduced "" "progressbar is displayed only i
 seta hud_panel_itemstime_showspawned "0" "show icons of already spawned items"
 seta hud_panel_itemstime_text "" "show text"
 seta hud_panel_itemstime_ratio "" "ratio between space reserved for text and icon width of each item entry (min value is 2)"
+seta hud_panel_itemstime_size_dinamic "" "reduce panel size by removing spacing beetwen items"
 

diff --git a/hud_luminos.cfg b/hud_luminos.cfg
index 92d245accc26a7654d6f75597398bd78e0b1d47a..ebf06360251cf34416092eea238ba38bc2a19ed6 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -304,5 +304,6 @@ seta hud_panel_itemstime_progressbar_reduced "0"
 seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "2"
+seta hud_panel_itemstime_size_dinamic "1"
 
 menu_sync

diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg
index 16a1a39243a0fbaa38568f69deee638658181f7b..c9d8efa9c00a60e0be13c55cce2747416ea1753f 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -304,5 +304,6 @@ seta hud_panel_itemstime_progressbar_reduced "0"
 seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "2"
+seta hud_panel_itemstime_size_dinamic "1"
 
 menu_sync

diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg
index 9c2d6e382d313dbac0b20b1428673a46f8133b48..e785511160184f0dcb9d31d16fbf0ed2016844b5 100644 (file)
--- a/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@ -304,5 +304,6 @@ seta hud_panel_itemstime_progressbar_reduced "0"
 seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "2"
+seta hud_panel_itemstime_size_dinamic "1"
 
 menu_sync

diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg
index feb939361dc0c8164f3aebb1ea394b888ac90417..c766eeeca13db8a1d68254f203a003d53d10719b 100644 (file)
--- a/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@ -304,5 +304,6 @@ seta hud_panel_itemstime_progressbar_reduced "1"
 seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "3.5"
+seta hud_panel_itemstime_size_dinamic "1"
 
 menu_sync

diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg
index 4a96925963f4c4ec5e4e849f895752b66790fdfc..98e6f0b8631a8979cad4c02736aaad976d842b0d 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -304,5 +304,6 @@ seta hud_panel_itemstime_progressbar_reduced "0"
 seta hud_panel_itemstime_showspawned "0"
 seta hud_panel_itemstime_text "1"
 seta hud_panel_itemstime_ratio "2"
+seta hud_panel_itemstime_size_dinamic "1"
 
 menu_sync

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index e5ea0bb0098fd1236a58b6c9ca4c105db88e52bb..d7055f25f7ba1978945f8d4943365b8d2f8c8be6 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -246,6 +246,7 @@ float autocvar_hud_panel_healtharmor_text;
 float autocvar_hud_panel_infomessages;
 float autocvar_hud_panel_infomessages_flip;
 float autocvar_hud_panel_itemstime;
+float autocvar_hud_panel_itemstime_size_dinamic;
 float autocvar_hud_panel_itemstime_ratio;
 float autocvar_hud_panel_itemstime_iconalign;
 float autocvar_hud_panel_itemstime_progressbar;

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 377480443c70b1a0901dd729ca20356b5b163989..3067539503c856322167c198d2bf9acb4ab796d5 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -5052,7 +5052,6 @@ void HUD_ItemsTime(void)
        pos = panel_pos;
        mySize = panel_size;
 
-       HUD_Panel_DrawBg(1);
        if(panel_bg_padding)
        {
                pos += '1 1 0' * panel_bg_padding;
@@ -5071,21 +5070,50 @@ void HUD_ItemsTime(void)
 
        local noref vector offset; // fteqcc sucks
        float newSize;
-       if(itemstime_size_x/itemstime_size_y > ar)
+       if(autocvar_hud_panel_itemstime_size_dinamic)
        {
-               newSize = ar * itemstime_size_y;
-               offset_x = itemstime_size_x - newSize;
-               pos_x += offset_x/2;
-               itemstime_size_x = newSize;
+               if(autocvar__hud_configure)
+               if(menu_enabled != 2)
+                       HUD_Panel_DrawBg(1); // also draw the bg of the entire panel
+
+               // reduce panel to avoid spacing items
+               if(itemstime_size_x / itemstime_size_y < ar)
+               {
+                       newSize = rows * itemstime_size_x / ar;
+                       pos_y += (mySize_y - newSize) / 2;
+                       mySize_y = newSize;
+                       itemstime_size_y = mySize_y / rows;
+               }
+               else
+               {
+                       newSize = columns * itemstime_size_y * ar;
+                       pos_x += (mySize_x - newSize) / 2;
+                       mySize_x = newSize;
+                       itemstime_size_x = mySize_x / columns;
+               }
+               panel_pos = pos - '1 1 0' * panel_bg_padding;
+               panel_size = mySize + '2 2 0' * panel_bg_padding;
        }
        else
        {
-               newSize = 1/ar * itemstime_size_x;
-               offset_y = itemstime_size_y - newSize;
-               pos_y += offset_y/2;
-               itemstime_size_y = newSize;
+               if(itemstime_size_x/itemstime_size_y > ar)
+               {
+                       newSize = ar * itemstime_size_y;
+                       offset_x = itemstime_size_x - newSize;
+                       pos_x += offset_x/2;
+                       itemstime_size_x = newSize;
+               }
+               else
+               {
+                       newSize = 1/ar * itemstime_size_x;
+                       offset_y = itemstime_size_y - newSize;
+                       pos_y += offset_y/2;
+                       itemstime_size_y = newSize;
+               }
        }
 
+       HUD_Panel_DrawBg(1);
+
        for (i = 0; i < ITEMSTIME_MAXITEMS; ++i) {
                if (ItemsTime_time[i] == -1)
                        continue;

diff --git a/qcsrc/client/hud_config.qc b/qcsrc/client/hud_config.qc
index 5406cc9c08c674e3885c421019bd03770c8bce40..dae28835583df17e8666d07c3d7d53c77045698b 100644 (file)
--- a/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@ -189,6 +189,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                                        HUD_Write_PanelCvar_q("_showspawned");
                                        HUD_Write_PanelCvar_q("_text");
                                        HUD_Write_PanelCvar_q("_ratio");
+                                       HUD_Write_PanelCvar_q("_size_dinamic");
                                        break;
                        }
                        HUD_Write("\n");

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.c b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.c
index 53134f2e90d6afce4b06f71280b42f8bca3768b3..349be0a8a281c9080531e073426e4ef883d13be7 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.c
@@ -38,5 +38,7 @@ void XonoticHUDItemsTimeDialog_fill(entity me)
                me.TD(me, 1, 2.6, e = makeXonoticSlider(2, 8, 0.5, "hud_panel_itemstime_ratio"));
        me.TR(me);
                me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_itemstime_showspawned", _("Show spawned items")));
+       me.TR(me);
+               me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_itemstime_size_dinamic", _("Dinamic size")));
 }
 #endif