Revert "Menu: don't set intendedWidth for tabs, they get overridden by parent dialogs...

This reverts commit e7230c21f582fb61399daa4e8367ff4e24ee0f0e.

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qh b/qcsrc/menu/xonotic/dialog_multiplayer_create.qh
index b6aee3a43f8259774915525877659fba631ff168..e275522864a84ee9af820e0cb6f55f7323df9efb 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.qh
@@ -5,6 +5,7 @@ CLASS(XonoticServerCreateTab, XonoticTab)
        METHOD(XonoticServerCreateTab, fill, void(entity));
        METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity));
        METHOD(XonoticServerCreateTab, gameTypeSelectNotify, void(entity));
+       ATTRIB(XonoticServerCreateTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticServerCreateTab, rows, float, 23);
        ATTRIB(XonoticServerCreateTab, columns, float, 6.2);  // added extra .2 for center space
 

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
index 1769597e03a8b4134d1328eff2d3e77a1e0656fe..38744f366de85800ac7693ebd6bf4b4afba93006 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticServerListTab, XonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity));
+       ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticServerListTab, rows, float, 23);
        ATTRIB(XonoticServerListTab, columns, float, 6.5);
 

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh
index 0cd2ec6371da84e236ad362c7fe134a410dc0876..ed3515f99d81566c64d5952576a4aa830833ddb6 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfotab.qh
@@ -5,6 +5,7 @@ CLASS(XonoticServerInfoTab, XonoticTab)
        METHOD(XonoticServerInfoTab, fill, void(entity));
        ATTRIB(XonoticServerInfoTab, title, string, _("Server Information"));
        ATTRIB(XonoticServerInfoTab, color, vector, SKINCOLOR_DIALOG_SERVERINFO);
+       ATTRIB(XonoticServerInfoTab, intendedWidth, float, 0.8);
        ATTRIB(XonoticServerInfoTab, rows, float, 17);
        ATTRIB(XonoticServerInfoTab, columns, float, 6.2);
 

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh
index 0cbdcb1f53363887e2eac3d2937107cbf04c7b17..ebc2d867e0d1740201354b716b8ea8daf9069620 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_termsofservice.qh
@@ -6,6 +6,7 @@ CLASS(XonoticServerToSTab, XonoticTab)
        METHOD(XonoticServerToSTab, loadToS, void(entity, string));
        ATTRIB(XonoticServerToSTab, title, string, _("Terms of Service"));
        ATTRIB(XonoticServerToSTab, color, vector, SKINCOLOR_DIALOG_SERVERINFO);
+       ATTRIB(XonoticServerToSTab, intendedWidth, float, 0.8);
        ATTRIB(XonoticServerToSTab, rows, float, 17);
        ATTRIB(XonoticServerToSTab, columns, float, 6.2);
 

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media.qh
index c6ecfb518899ab3e6143df8b83bfa62d658c54b1..9713e82c2da595fc6833dc287021a00cae5f7f00 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticMediaTab, XonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity));
+       ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticMediaTab, rows, float, 23);
        ATTRIB(XonoticMediaTab, columns, float, 3);
        ATTRIB(XonoticMediaTab, name, string, "Media");

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qh
index b90f4b8703317f9ba7bf589a9b61ceb75c96e10c..cf3548d77409e791fecf40d9bf1caec2cab8371d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticDemoBrowserTab, XonoticTab)
        METHOD(XonoticDemoBrowserTab, fill, void(entity));
+       ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticDemoBrowserTab, rows, float, 21);
        ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5);
        ATTRIB(XonoticDemoBrowserTab, name, string, "DemoBrowser");

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qh
index e13e239920459d1b5c60e353bf735d7e9e2c1a08..6172dae03cbff4bffadab55e694ab68fd9859c72 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticMusicPlayerTab, XonoticTab)
        METHOD(XonoticMusicPlayerTab, fill, void(entity));
+       ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticMusicPlayerTab, rows, float, 21);
        ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5);
        ATTRIB(XonoticMusicPlayerTab, name, string, "MusicPlayer");

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qh
index 3bc3dcfeb855a3e8dd3abe86979316b86c1ab352..66dc3cf077fac5591b20881fcb52d70cf53b8575 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticScreenshotBrowserTab, XonoticTab)
        METHOD(XonoticScreenshotBrowserTab, fill, void(entity));
+       ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1);
        ATTRIB(XonoticScreenshotBrowserTab, rows, float, 21);
        ATTRIB(XonoticScreenshotBrowserTab, columns, float, 6.5);
        ATTRIB(XonoticScreenshotBrowserTab, name, string, "ScreenshotBrowser");

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qh b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qh
index e0ff5a3503452fd67382e388d4a132b1ab791b63..f346aaf66672c0e26de8537a47dee05be6a63bf7 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qh
@@ -4,6 +4,7 @@
 CLASS(XonoticProfileTab, XonoticTab)
        METHOD(XonoticProfileTab, fill, void(entity));
        METHOD(XonoticProfileTab, draw, void(entity));
+       ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticProfileTab, rows, float, 23);
        ATTRIB(XonoticProfileTab, columns, float, 6.1);  // added extra .2 for center space
        ATTRIB(XonoticProfileTab, playerNameLabel, entity);

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qh b/qcsrc/menu/xonotic/dialog_settings_audio.qh
index 0eaff98588517a69114635afef1a6c2c72404d99..5794a70ccfb8e1852b59dc15b226d24fbdf846e0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticAudioSettingsTab, XonoticTab)
        METHOD(XonoticAudioSettingsTab, fill, void(entity));
+       ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2);  // added extra .2 for center space
        ATTRIB(XonoticAudioSettingsTab, hiddenMenuSoundsSlider, entity);

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qh b/qcsrc/menu/xonotic/dialog_settings_effects.qh
index 7a99a140663e2cd98b531b9a48836c4df24e7f4a..369c68d9132932d434315e3b630098b57807fbfb 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticEffectsSettingsTab, XonoticTab)
        METHOD(XonoticEffectsSettingsTab, fill, void(entity));
+       ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticEffectsSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2);  // added extra .2 for center space
 ENDCLASS(XonoticEffectsSettingsTab)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qh b/qcsrc/menu/xonotic/dialog_settings_game.qh
index 0f3ae81489ea643196e20feb68249c5d6df72a39..c0965c23249470b0e686ddbcb68822abecc1b2b1 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qh
@@ -34,6 +34,7 @@ ENDCLASS(XonoticRegisteredSettingsList)
 #include "tab.qh"
 #include "scrollpanel.qh"
 CLASS(XonoticGameSettingsTab, XonoticTab)
+       ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticGameSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticGameSettingsTab, columns, float, 6.5);
        ATTRIB(XonoticGameSettingsTab, source, DataSource, NEW(SettingSource));

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh
index ed15b1e0bc106f737dc69afbb8f9bcd4825f08f2..33576a3ec0a3ffdd0a5bd5ce7f59f4b07afb51fa 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh
@@ -5,6 +5,7 @@ CLASS(XonoticGameCrosshairSettingsTab, XonoticTab)
        METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity));
        METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity));
        ATTRIB(XonoticGameCrosshairSettingsTab, title, string, _("Crosshair"));
+       ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2);
 ENDCLASS(XonoticGameCrosshairSettingsTab)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qh b/qcsrc/menu/xonotic/dialog_settings_game_hud.qh
index 108b09d4a21420c01f0b3d691f35b26020e20b56..a9851dc63414255e95a64b301797ee9c8d9c0462 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qh
@@ -5,6 +5,7 @@ CLASS(XonoticGameHUDSettingsTab, XonoticTab)
        METHOD(XonoticGameHUDSettingsTab, fill, void(entity));
        METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity));
        ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD"));
+       ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticGameHUDSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2);
 ENDCLASS(XonoticGameHUDSettingsTab)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.qh b/qcsrc/menu/xonotic/dialog_settings_game_messages.qh
index c5230aeddb3419ad64fcff1f941642b05e3c9d1f..28a7698626368175b407ae3b2e2accc7c26084e8 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qh
@@ -5,6 +5,7 @@ CLASS(XonoticGameMessageSettingsTab, XonoticTab)
        METHOD(XonoticGameMessageSettingsTab, fill, void(entity));
        METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity));
        ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages"));
+       ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticGameMessageSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6);
        ATTRIB(XonoticGameMessageSettingsTab, weaponsList, entity);

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qh b/qcsrc/menu/xonotic/dialog_settings_game_model.qh
index 04240353a899047e42aa2eacc98a8d986b335bb4..c3caabee724b3f4a4c7bc620a0e09f1e7f55d93b 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qh
@@ -6,6 +6,7 @@ CLASS(XonoticGameModelSettingsTab, XonoticTab)
        METHOD(XonoticGameModelSettingsTab, showNotify, void(entity));
        ATTRIB(XonoticGameModelSettingsTab, title, string, _("Models"));
        ATTRIB(XonoticGameModelSettingsTab, titleTooltip, string, _("Customize how players and items are displayed in game"));
+       ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticGameModelSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticGameModelSettingsTab, columns, float, 5);
 ENDCLASS(XonoticGameModelSettingsTab)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qh b/qcsrc/menu/xonotic/dialog_settings_game_view.qh
index c7d1f23b1633c1f066a27b00e7e72ceb608d60ce..f9d6001199b740f6555230112c19fd616fc22971 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_view.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qh
@@ -5,6 +5,7 @@ CLASS(XonoticGameViewSettingsTab, XonoticTab)
        METHOD(XonoticGameViewSettingsTab, fill, void(entity));
        METHOD(XonoticGameViewSettingsTab, showNotify, void(entity));
        ATTRIB(XonoticGameViewSettingsTab, title, string, _("View"));
+       ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticGameViewSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2);
 ENDCLASS(XonoticGameViewSettingsTab)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh
index b61d442b1784f5ecf09e90c3e7743262810caefe..ded41a5abdeb25963cccdef129ba591642df879a 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh
@@ -5,6 +5,7 @@ CLASS(XonoticGameWeaponsSettingsTab, XonoticTab)
        METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity));
        METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity));
        ATTRIB(XonoticGameWeaponsSettingsTab, title, string, _("Weapons"));
+       ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6);
        ATTRIB(XonoticGameWeaponsSettingsTab, weaponsList, entity);

diff --git a/qcsrc/menu/xonotic/dialog_settings_input.qh b/qcsrc/menu/xonotic/dialog_settings_input.qh
index 5064de9ebbe7bbb9c37a70878d0e7a54f41353c9..13e56afbb5bf751ce2436e4241d903c4ba0248c3 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_input.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_input.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticInputSettingsTab, XonoticTab)
        METHOD(XonoticInputSettingsTab, fill, void(entity));
+       ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticInputSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticInputSettingsTab, columns, float, 6.2);  // added extra .2 for center space
        ATTRIB(XonoticInputSettingsTab, name, string, "inputsettings");

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qh b/qcsrc/menu/xonotic/dialog_settings_misc.qh
index 2146bebd74c0411036cc66b58b1f670070a7698f..a2a86b7e1fb956adbbb750f090168cbe8df3650d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticMiscSettingsTab, XonoticTab)
        METHOD(XonoticMiscSettingsTab, fill, void(entity));
+       ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2);
 ENDCLASS(XonoticMiscSettingsTab)

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qh b/qcsrc/menu/xonotic/dialog_settings_user.qh
index f1ba31a148f7a0b86b7421ff00105ff1b55fd63f..22f84d0f0b7c024b5247f17a28c46efa9848bfab 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_user.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticUserSettingsTab, XonoticTab)
        METHOD(XonoticUserSettingsTab, fill, void(entity));
+       ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticUserSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticUserSettingsTab, columns, float, 6);
 ENDCLASS(XonoticUserSettingsTab)

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qh b/qcsrc/menu/xonotic/dialog_settings_video.qh
index 2c6fe0a88e91a82fe15dc649723ebedd44730d64..61d8a368e0e67edd06003e6b6966fb9525f298fa 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_video.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_video.qh
@@ -3,6 +3,7 @@
 #include "tab.qh"
 CLASS(XonoticVideoSettingsTab, XonoticTab)
        METHOD(XonoticVideoSettingsTab, fill, void(entity));
+       ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9);
        ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5);
        ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2);  // added extra .2 for center space
        ATTRIB(XonoticVideoSettingsTab, name, string, "videosettings");