Add hud_panelname_bg_padding for increasing/decreasing distance from contents to...

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 42d6c1592d4bbace8f718ea8166bb39df8de1363..427e1a12694d889c6b98cb02e97457085c472542 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1356,6 +1356,7 @@ seta hud_weaponicons_bg "" "if set to something else than \"\" = override defaul
 seta hud_weaponicons_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_weaponicons_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_weaponicons_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_weaponicons_bg_padding 0 "padding of contents from border"
 
 seta hud_inventory 1 "enable/disable this panel"
 seta hud_inventory_pos "0.179783 -0.092189" "position of this panel"
@@ -1365,6 +1366,7 @@ seta hud_inventory_bg "" "if set to something else than \"\" = override default
 seta hud_inventory_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_inventory_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_inventory_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_inventory_bg_padding 0 "padding of contents from border"
 
 seta hud_powerups 1 "enable/disable this panel"
 seta hud_powerups_pos "-0.311922 -0.084896" "position of this panel"
@@ -1375,6 +1377,7 @@ seta hud_powerups_bg "" "if set to something else than \"\" = override default b
 seta hud_powerups_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_powerups_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_powerups_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_powerups_bg_padding 0 "padding of contents from border"
 seta hud_progressbar_strength_color "0 0 0.6" "R G B vector of the progress bar background color"
 seta hud_progressbar_shield_color "0.6 0 0.6" "R G B vector of the progress bar background color"
 
@@ -1387,6 +1390,7 @@ seta hud_healtharmor_bg "" "if set to something else than \"\" = override defaul
 seta hud_healtharmor_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_healtharmor_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_healtharmor_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_healtharmor_bg_padding 0 "padding of contents from border"
 seta hud_progressbar_health_color "0.6 0 0" "R G B vector of the progress bar background color"
 seta hud_progressbar_armor_color "0 0.6 0" "R G B vector of the progress bar background color"
 seta hud_progressbar_fuel_color "0.6 0.6 0" "R G B vector of the progress bar background color"
@@ -1398,6 +1402,7 @@ seta hud_notify_bg "" "if set to something else than \"\" = override default bac
 seta hud_notify_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_notify_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_notify_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_notify_bg_padding 0 "padding of contents from border"
 
 seta hud_timer 1 "enable/disable this panel"
 seta hud_timer_pos "-0.213725 0" "position of this base of the panel"
@@ -1407,6 +1412,7 @@ seta hud_timer_bg border "if set to something else than \"\" = override default
 seta hud_timer_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_timer_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_timer_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_timer_bg_padding 0 "padding of contents from border"
 
 seta hud_radar 1 "enable/disable this panel"
 seta hud_radar_pos "0 0" "position of this base of the panel"
@@ -1415,6 +1421,7 @@ seta hud_radar_bg "" "if set to something else than \"\" = override default back
 seta hud_radar_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_radar_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_radar_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_radar_bg_padding 0 "padding of contents from border"
 
 seta hud_score 1 "enable/disable this panel"
 seta hud_score_pos "-0.225469 -0.084404" "position of this base of the panel"
@@ -1423,6 +1430,7 @@ seta hud_score_bg "" "if set to something else than \"\" = override default back
 seta hud_score_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_score_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_score_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_score_bg_padding 0 "padding of contents from border"
 
 seta hud_racetimer 1 "enable/disable this panel"
 seta hud_racetimer_pos "-0.614706 0" "position of this base of the panel"
@@ -1431,6 +1439,7 @@ seta hud_racetimer_bg "" "if set to something else than \"\" = override default
 seta hud_racetimer_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_racetimer_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_racetimer_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_racetimer_bg_padding 0 "padding of contents from border"
 
 seta hud_vote 1 "enable/disable this panel"
 seta hud_vote_pos "-0.321140 -0.268230" "position of this base of the panel"
@@ -1440,6 +1449,7 @@ seta hud_vote_bg "" "if set to something else than \"\" = override default backg
 seta hud_vote_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_vote_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_vote_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_vote_bg_padding 0 "padding of contents from border"
 
 seta hud_pressedkeys 1 "enable/disable this panel"
 seta hud_pressedkeys_pos "-0.571569 -0.265625" "position of this base of the panel"
@@ -1448,6 +1458,7 @@ seta hud_pressedkeys_bg "" "if set to something else than \"\" = override defaul
 seta hud_pressedkeys_bg_color "" "optional R G B string of the background color, otherwise use hud default"
 seta hud_pressedkeys_bg_alpha 0 "if set to something else than 0 = override default alpha"
 seta hud_pressedkeys_bg_border 0 "if set to something else than 0 = override size of border around the background"
+seta hud_pressedkeys_bg_padding 0 "padding of contents from border"
 
 // scoreboard
 seta scoreboard_border_thickness 1 "scoreboard border thickness"

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 8f20c6d6c8a99e43251cfb877c3046d22950bd19..c7b0f8685957554933c8d36d186b7877abe5515d 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1149,6 +1149,13 @@ void HUD_WeaponIcons()
        heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        // hits
        weapon_stats = getstati(STAT_DAMAGE_HITS);
@@ -1270,6 +1277,13 @@ void HUD_Inventory()
        mySize = HUD_Panel_GetSize(id);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        // ammo
        stat_items = getstati(STAT_ITEMS);
@@ -1362,6 +1376,13 @@ void HUD_Powerups() {
        mySize = HUD_Panel_GetSize(id);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        float strength_time, shield_time;
 
@@ -1592,6 +1613,13 @@ void HUD_HealthArmor(void)
        mySize = HUD_Panel_GetSize(id);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        float armor, health, x;
        armor = getstati(STAT_ARMOR);
@@ -1842,6 +1870,13 @@ void HUD_Notify (void)
        mySize = HUD_Panel_GetSize(id);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        string s;
        entity tm;
@@ -1970,6 +2005,13 @@ void HUD_Timer()
        mySize = HUD_Panel_GetSize(id);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;
 
@@ -2022,6 +2064,13 @@ void HUD_Radar(void)
        mySize = HUD_Panel_GetSize(id);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        local float color1, color2; // color already declared as a global in hud.qc
        local vector rgb;
@@ -2163,6 +2212,13 @@ void HUD_Score()
        mySize = HUD_Panel_GetSize(id);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        float score, distribution, leader;
        float score_len, distr_len;
@@ -2250,6 +2306,13 @@ void HUD_RaceTimer (void) {
        mySize = HUD_Panel_GetSize(id);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        drawfont = hud_bigfont;
        float a, t;
@@ -2405,6 +2468,13 @@ void HUD_VoteWindow(void)
        }
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        if(vote_alpha) {
                a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
@@ -2944,6 +3014,13 @@ void HUD_DrawPressedKeys(void)
        mySize = HUD_Panel_GetSize(id);
 
        HUD_Panel_DrawBg(id, pos, mySize);
+       float padding;
+       padding = cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_padding"));
+       if(padding)
+       {
+               pos += '1 1 0' * padding;
+               mySize -= '2 2 0' * padding;
+       }
 
        float pressedkeys;