Merge remote-tracking branch 'origin/mrbougo/clonefixes'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item / modalcontroller.c

diff --git a/qcsrc/menu/item/modalcontroller.c b/qcsrc/menu/item/modalcontroller.c
index 5a5541dc7b0da4706800380998b531d67e5de329..8a025cb330302215489cbe3bb62d290c33ad7b22 100644 (file)
--- a/qcsrc/menu/item/modalcontroller.c
+++ b/qcsrc/menu/item/modalcontroller.c
@@ -2,7 +2,6 @@
 CLASS(ModalController) EXTENDS(Container)
        METHOD(ModalController, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(ModalController, draw, void(entity))
-       METHOD(ModalController, addItem, void(entity, entity, vector, vector, float))
        METHOD(ModalController, showChild, void(entity, entity, vector, vector, float))
        METHOD(ModalController, hideChild, void(entity, entity, float))
        METHOD(ModalController, hideAll, void(entity, float))
@@ -87,6 +86,8 @@ void DialogOpenButton_Click_withCoords(entity button, entity tab, vector theOrig
                return;
        if(button)
                button.forcePressed = 1;
+       if(tab.parent.focusedChild)
+               tab.parent.focusedChild.saveFocus(tab.parent.focusedChild);
        tab.ModalController_controllingButton = button;
        tab.parent.showChild(tab.parent, tab, theOrigin, theSize, 0);
 }