Merge branch 'master' into ags4

Author: ivan-mogilko

.cirrus.yml

@@ -88,8 +88,14 @@ build_linux_cmake_task:
     arch=$(dpkg --print-architecture)
     mkdir build_release_$arch && cd build_release_$arch
     cmake .. \
-      -DAGS_USE_LOCAL_ALL_LIBRARIES=1 \
+      -DAGS_USE_LOCAL_SDL2=1 \
+      -DAGS_USE_LOCAL_OGG=1 \
+      -DAGS_USE_LOCAL_THEORA=1 \
+      -DAGS_USE_LOCAL_VORBIS=1 \
       -DAGS_USE_LOCAL_SDL2_SOUND=0 \
+      -DAGS_USE_LOCAL_GLM=0 \
+      -DAGS_USE_LOCAL_MINIZ=0 \
+      -DAGS_USE_LOCAL_TINYXML=0 \
       -DCMAKE_BUILD_TYPE=Release \
       -DAGS_BUILD_TOOLS=1 \
       -DAGS_TESTS=1 \

Editor/AGS.Editor/GUI/GoToNumberDialog.Designer.cs

@@ -104,11 +104,16 @@ private bool ExistInList (int number)
             return GetItemByNumber(number) != null;
         }
 
+        private void EnableOkButtonIfNumberExists()
+        {
+            btnOk.Enabled = ExistInList(Number);
+        }
+
         private void syncFromUpDownToListBox()
         {
+            EnableOkButtonIfNumberExists();
             if (ExistInList(Number))
             {
-                btnOk.Enabled = true;
                 Tuple<int, string> selected = GetItemByNumber(Number);
                 if (selected != lstNodes.SelectedItem)
                 {
@@ -117,7 +122,6 @@ private void syncFromUpDownToListBox()
             }
             else
             {
-                btnOk.Enabled = false;
                 lstNodes.SelectedItem = null;
                 lstNodes.Invalidate();
             }
@@ -142,7 +146,9 @@ private void upDownNumber_ValueChanged(object sender, EventArgs e)
 
         private void upDownNumber_KeyUp(object sender, KeyEventArgs e)
         {
-            syncFromUpDownToListBox();
+            // if we sync the list will then erase back the upDown number
+            // so we only disable the ok button if the number is invalid
+            EnableOkButtonIfNumberExists();
         }
 
         private void lstNodes_SelectedValueChanged(object sender, EventArgs e)