Changeset - 46b3b97a9901
Parent rev.
Child rev.
[Not reviewed]
VERSION_T8_RC6 default
0 1 0
Jason Maltzen (jmaltzen) - 7 years ago 2018-05-21 20:05:30
jason.maltzen@unsanctioned.net
Don't allow <=0 screen resolution or pixel scale settings, as that doesn't make sense.
1 file changed with 43 insertions and 40 deletions:
MainWindow.cs
43
40
0 comments (0 inline, 0 general)
MainWindow.cs
➞
Show inline comments
...
 
@@ -33,9 +33,9 @@ public partial class MainWindow : Gtk.Wi
 

			




	
	
	
		
 
    bool unsavedData = false;


			




	
	
	
		
 
    bool shouldShutDown = false;


			




	
	
	
		
 
    bool unsavedData;


			




	
	
	
		
 
    bool shouldShutDown;


			




	
	
	
		
 
    List<string> profileList = new List<string>();


			




	
	
	
		
 
    PlayerProfile profile = null;


			




	
	
	
		
 
    PlayerProfile profile;


			




	
	
	
		
 

			




	
	
	
		
 
    Gdk.Window rootWindow = null;


			




	
	
	
		
 
    Gdk.Pixbuf screenBuffer = null;


			




	
	
	
		
 
    Gdk.Window rootWindow;


			




	
	
	
		
 
    Gdk.Pixbuf screenBuffer;


			




	
	
	
		
 

			




	...
	
		
 
@@ -110,3 +110,3 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
        // get its width and height


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Load();


			




	
	
	
		
 
        AppSettings.Load();


			




	
	
	
		
 

			




	...
	
		
 
@@ -115,3 +115,3 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
        bool enableDebugMenu;


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Get("EnableDebugMenu", out enableDebugMenu);


			




	
	
	
		
 
        AppSettings.Get("EnableDebugMenu", out enableDebugMenu);


			




	
	
	
		
 
        this.DebugAction.Visible = enableDebugMenu;


			




	...
	
		
 
@@ -262,4 +262,5 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
        {


			




	
	
	
		
 
            SelectProfileDialog selectProfileDialog = new SelectProfileDialog();


			




	
	
	
		
 
            selectProfileDialog.ProfileList = profileList;


			




	
	
	
		
 
            SelectProfileDialog selectProfileDialog = new SelectProfileDialog {


			




	
	
	
		
 
                ProfileList = profileList


			




	
	
	
		
 
            };


			




	
	
	
		
 
            ResponseType resp = (ResponseType)selectProfileDialog.Run();


			




	...
	
		
 
@@ -407,4 +408,5 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
        bool profileSelected = false;


			




	
	
	
		
 
        SelectProfileDialog selectProfileDialog = new SelectProfileDialog();


			




	
	
	
		
 
        selectProfileDialog.ProfileList = profileList;


			




	
	
	
		
 
        SelectProfileDialog selectProfileDialog = new SelectProfileDialog {


			




	
	
	
		
 
            ProfileList = profileList


			




	
	
	
		
 
        };


			




	
	
	
		
 
        ResponseType resp = (ResponseType)selectProfileDialog.Run();


			




	...
	
		
 
@@ -441,8 +443,8 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 
    {


			




	
	
	
		
 
        AboutDialog aboutDialog = new AboutDialog();


			




	
	
	
		
 

			




	
	
	
		
 
        aboutDialog.ProgramName = "Desert Paint Lab";


			




	
	
	
		
 
        aboutDialog.Version = APP_VERSION;


			




	
	
	
		
 
        aboutDialog.Comments = "Desert Paint Lab paint reaction recorder for A Tale in the Desert";


			




	
	
	
		
 
        aboutDialog.Authors = new string[] { "Tess Snider", "Jason Maltzen" };


			




	
	
	
		
 
        AboutDialog aboutDialog = new AboutDialog {


			




	
	
	
		
 
            ProgramName = "Desert Paint Lab",


			




	
	
	
		
 
            Version = APP_VERSION,


			




	
	
	
		
 
            Comments = "Desert Paint Lab paint reaction recorder for A Tale in the Desert",


			




	
	
	
		
 
            Authors = new string [] { "Tess Snider", "Jason Maltzen" }


			




	
	
	
		
 
        };


			




	
	
	
		
 
        //aboutDialog.Website = "http://www.google.com/";


			




	...
	
		
 
@@ -725,15 +727,16 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 

			




	
	
	
		
 
        DesertPaintLab.AppSettings.Get("ScreenWidth", out screenWidth);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Get("ScreenHeight", out screenHeight);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Get("PixelMultiplier", out pixelMultiplier);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Get("InterfaceSize", out interfaceSizeIndex);


			




	
	
	
		
 
        AppSettings.Get("ScreenWidth", out screenWidth);


			




	
	
	
		
 
        AppSettings.Get("ScreenHeight", out screenHeight);


			




	
	
	
		
 
        AppSettings.Get("PixelMultiplier", out pixelMultiplier);


			




	
	
	
		
 
        AppSettings.Get("InterfaceSize", out interfaceSizeIndex);


			




	
	
	
		
 
        InterfaceSize interfaceSize = (InterfaceSize)interfaceSizeIndex;


			




	
	
	
		
 

			




	
	
	
		
 
        ScreenCheckDialog screenCheckDialog = new ScreenCheckDialog();


			




	
	
	
		
 
        screenCheckDialog.DetectedScreenWidth = detectedScreenWidth;


			




	
	
	
		
 
        screenCheckDialog.DetectedScreenHeight = detectedScreenHeight;


			




	
	
	
		
 
        screenCheckDialog.ScreenWidth = screenWidth;


			




	
	
	
		
 
        screenCheckDialog.ScreenHeight = screenHeight;


			




	
	
	
		
 
        screenCheckDialog.GamePixelWidth = pixelMultiplier;


			




	
	
	
		
 
        screenCheckDialog.InterfaceSize = interfaceSize;


			




	
	
	
		
 
        ScreenCheckDialog screenCheckDialog = new ScreenCheckDialog {


			




	
	
	
		
 
            DetectedScreenWidth = detectedScreenWidth,


			




	
	
	
		
 
            DetectedScreenHeight = detectedScreenHeight,


			




	
	
	
		
 
            ScreenWidth = screenWidth,


			




	
	
	
		
 
            ScreenHeight = screenHeight,


			




	
	
	
		
 
            GamePixelWidth = pixelMultiplier,


			




	
	
	
		
 
            InterfaceSize = interfaceSize


			




	
	
	
		
 
        };


			




	
	
	
		
 

			




	...
	
		
 
@@ -741,5 +744,5 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 

			




	
	
	
		
 
        screenWidth = screenCheckDialog.ScreenWidth;


			




	
	
	
		
 
        screenHeight = screenCheckDialog.ScreenHeight;


			




	
	
	
		
 
        pixelMultiplier = screenCheckDialog.GamePixelWidth;


			




	
	
	
		
 
        screenWidth = Math.Max(640, screenCheckDialog.ScreenWidth); // don't support screen smaller than 640x480 no matter what the user says


			




	
	
	
		
 
        screenHeight = Math.Max(480, screenCheckDialog.ScreenHeight);


			




	
	
	
		
 
        pixelMultiplier = Math.Max(1, screenCheckDialog.GamePixelWidth); // Don't allow 0/negative pixel multiplier


			




	
	
	
		
 
        interfaceSize = screenCheckDialog.InterfaceSize;


			




	...
	
		
 
@@ -747,7 +750,7 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 

			




	
	
	
		
 
        DesertPaintLab.AppSettings.Set("ScreenWidth", screenWidth);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Set("ScreenHeight", screenHeight);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Set("PixelMultiplier", pixelMultiplier);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Set("InterfaceSize", (int)interfaceSize);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Save();


			




	
	
	
		
 
        AppSettings.Set("ScreenWidth", screenWidth);


			




	
	
	
		
 
        AppSettings.Set("ScreenHeight", screenHeight);


			




	
	
	
		
 
        AppSettings.Set("PixelMultiplier", pixelMultiplier);


			




	
	
	
		
 
        AppSettings.Set("InterfaceSize", (int)interfaceSize);


			




	
	
	
		
 
        AppSettings.Save();


			




	
	
	
		
 

			




	...
	
		
 
@@ -768,6 +771,6 @@ public partial class MainWindow : Gtk.Wi


			




	
	
	
		
 

			




	
	
	
		
 
        DesertPaintLab.AppSettings.Get("ScreenWidth", out screenWidth);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Get("ScreenHeight", out screenHeight);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Get("PixelMultiplier", out pixelMultiplier);


			




	
	
	
		
 
        DesertPaintLab.AppSettings.Get("InterfaceSize", out interfaceSizeIndex);


			




	
	
	
		
 
        AppSettings.Get("ScreenWidth", out screenWidth);


			




	
	
	
		
 
        AppSettings.Get("ScreenHeight", out screenHeight);


			




	
	
	
		
 
        AppSettings.Get("PixelMultiplier", out pixelMultiplier);


			




	
	
	
		
 
        AppSettings.Get("InterfaceSize", out interfaceSizeIndex);


			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: opal4.opalstack.com-290901
    
    
        This site is powered by
            Kallithea 0.6.2,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support