Disable scrolling of tabs in menu:Settings/Game (currently inactive because all setti...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_settings_game.qc

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qc b/qcsrc/menu/xonotic/dialog_settings_game.qc
index 87134cb7812c15635247ec2799c21abf88c8a27e..ba10d276ebfb119b32955dc73b2243e46b9dd414 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qc
@@ -94,9 +94,15 @@ CONSTRUCTOR(XonoticRegisteredSettingsList, DataSource _source) {
 
 METHOD(XonoticGameSettingsTab, topicChangeNotify, void(entity, entity this))
 {
 
 METHOD(XonoticGameSettingsTab, topicChangeNotify, void(entity, entity this))
 {

-    entity s = this.currentPanel;
-    s.viewportHeight = 15.5;
-    entity c = s.currentPanel;
+       entity s = NULL;
+       entity c = this.currentPanel;
+       if (c.classname == "XonoticScrollPanel")
+       {
+               s = this.currentPanel;
+               s.viewportHeight = 15.5;
+               c = s.currentPanel;
+       }
+

     entity removing = this.currentItem;
     DataSource data = this.topicList.source;
     entity adding = data.getEntry(data, this.topicList.selectedItem, func_null);
     entity removing = this.currentItem;
     DataSource data = this.topicList.source;
     entity adding = data.getEntry(data, this.topicList.selectedItem, func_null);


@@ -109,7 +115,8 @@ METHOD(XonoticGameSettingsTab, topicChangeNotify, void(entity, entity this))
         this.currentItem = adding;
         adding.resizeNotify(adding, '0 0 0', c.size, '0 0 0', c.size);
         c.addItem(c, adding, '0 0 0', '1 1 0', 1);
         this.currentItem = adding;
         adding.resizeNotify(adding, '0 0 0', c.size, '0 0 0', c.size);
         c.addItem(c, adding, '0 0 0', '1 1 0', 1);

-               s.resizeNotify(s, '0 0 0', s.size, '0 0 0', s.size);
+               if (s)
+                       s.resizeNotify(s, '0 0 0', s.size, '0 0 0', s.size);

     }
 }
 METHOD(XonoticGameSettingsTab, fill, void(entity this))
     }
 }
 METHOD(XonoticGameSettingsTab, fill, void(entity this))