Changeset - d792b40d3ef9
Parent rev.
Child rev.
[Not reviewed]
VERSION_T8_RC4 default
0 2 0
Jason Maltzen - 7 years ago 2018-05-17 21:16:24
jason@hiddenachievement.com
Disabling the capture button then re-updating the ingredients to fix button states was having the side effect of clearing the reacted color swatch. That was done to re-enable UI elements that were disabled during recording. Now enabling them explicitly to fix the problem.
2 files changed with 6 insertions and 6 deletions:
ReactionRecorder.cs
4
1
UI/CaptureView.cs
2
5
0 comments (0 inline, 0 general)
ReactionRecorder.cs
➞
Show inline comments
...
 
@@ -109,17 +109,18 @@ namespace DesertPaintLab
 
        public int BlueBarSpacing {  get { return blueBarSpacing; } }
 

			




	
	
	
		
 
        // Current Status


			




	
	
	
		
 
        public bool IsCaptured { get; private set; }


			




	
	
	
		
 
        public int X { get; private set; }


			




	
	
	
		
 
        public int Y { get; private set; }


			




	
	
	
		
 
        public int ScreenWidth { get; private set; }


			




	
	
	
		
 
        public int ScreenHeight { get; private set; }


			




	
	
	
		
 
        public PaintColor RecordedColor { get; private set; }


			




	
	
	
		
 
        private PaintColor _recordedColor = new PaintColor();


			




	
	
	
		
 
        public PaintColor RecordedColor { get { return _recordedColor; } private set { _recordedColor.Set(value); } }


			




	
	
	
		
 
        public int RedBarX { get; private set; }


			




	
	
	
		
 
        public int RedBarY { get; private set; }


			




	
	
	
		
 

			




	
	
	
		
 
        int pixelMultiplier = 1;


			




	
	
	
		
 
        InterfaceSize interfaceSize;


			




	
	
	
		
 

			




	
	
	
		
 
        bool firstRun = true;


			




	
	
	
		
 
        int lastSwatchX = -1;


			




	...
	
		
 
@@ -454,16 +455,18 @@ namespace DesertPaintLab


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        unsafe public bool CaptureReaction(byte* pixBytes, int screenshotWidth, int screenshotHeight, int stride)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            PaintColor reactedColor = new PaintColor();


			




	
	
	
		
 
            int redPixelStart = 0;


			




	
	
	
		
 
            ScreenWidth = screenshotWidth;


			




	
	
	
		
 
            ScreenHeight = screenshotHeight;


			




	
	
	
		
 
            IsCaptured = false;


			




	
	
	
		
 
            _recordedColor.Clear();


			




	
	
	
		
 

			




	
	
	
		
 
            IsCaptured = false;


			




	
	
	
		
 
            if (!firstRun)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                // If this is not the first run, let's check the last location, to see if the UI is still there.


			




	
	
	
		
 
                if (TestPosition(lastSwatchX, lastSwatchY, pixBytes, screenshotWidth, screenshotHeight, stride, ref reactedColor, ref redPixelStart))


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    IsCaptured = true;


			




        

    


    
    

    

        

                

                    UI/CaptureView.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -283,17 +283,17 @@ namespace DesertPaintLab


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            if (notifyCaptureProgress == null)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                notifyCaptureProgress = new Gtk.ThreadNotify(new Gtk.ReadyEvent(NotifyCaptureProgress));


			




	
	
	
		
 
                notifyCaptureComplete = new Gtk.ThreadNotify(new Gtk.ReadyEvent(NotifyCaptureComplete));


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            this.reactionSwatch.Color = new PaintColor("Searching", "00", "00", "00");


			




	
	
	
		
 
            this.reactionSwatch.Clear();


			




	
	
	
		
 

			




	
	
	
		
 
            Thread thr = new Thread(new ThreadStart(this.CaptureReactionThread));


			




	
	
	
		
 
            thr.Priority = ThreadPriority.AboveNormal;


			




	
	
	
		
 
            thr.Start();


			




	
	
	
		
 
            //OnCaptureComplete(isCaptured, reactedColor, screenWidth, screenHeight, stride, redPixelStart);


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        unsafe private void CaptureReactionThread()


			




	...
	
		
 
@@ -415,18 +415,16 @@ namespace DesertPaintLab


			




	
	
	
		
 
                    md.Destroy();


			




	
	
	
		
 
                    // reaction clipped - don't let them record


			




	
	
	
		
 
                    recordButton.Sensitive = false;


			




	
	
	
		
 
                }


			




	
	
	
		
 
                else


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    recordButton.Sensitive = recordEnabled;


			




	
	
	
		
 
                }


			




	
	
	
		
 

			




	
	
	
		
 
                captureButton.Sensitive = false;


			




	
	
	
		
 
            }


			




	
	
	
		
 
            else


			




	
	
	
		
 
            {


			




	
	
	
		
 
                Gtk.MessageDialog md = new Gtk.MessageDialog((Gtk.Window)Toplevel,


			




	
	
	
		
 
                    Gtk.DialogFlags.DestroyWithParent,


			




	
	
	
		
 
                    Gtk.MessageType.Error, Gtk.ButtonsType.Ok,


			




	
	
	
		
 
                    "Pigment Lab dialog box NOT FOUND.  Please ensure " +


			




	
	
	
		
 
                    "that there is an unobstructed view of the dialog " +


			




	...
	
		
 
@@ -437,18 +435,17 @@ namespace DesertPaintLab


			




	
	
	
		
 
                md.Destroy();


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            progressBar.Hide();


			




	
	
	
		
 
            recordButton.Show();


			




	
	
	
		
 

			




	
	
	
		
 
            ingredient1ComboBox.Sensitive = true;


			




	
	
	
		
 
            ingredient2ComboBox.Sensitive = true;


			




	
	
	
		
 
            ingredient3ComboBox.Sensitive = false;


			




	
	
	
		
 
            UpdateIngredients();


			




	
	
	
		
 
            ingredient3ComboBox.Sensitive = (GetSelectedReagentName(1) != null) && (GetSelectedReagentName(2) != null);


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private void NotifyCaptureComplete()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            OnCaptureComplete(


			




	
	
	
		
 
                ReactionRecorder.Instance.IsCaptured,


			




	
	
	
		
 
                ReactionRecorder.Instance.RecordedColor,


			




	
	
	
		
 
                ReactionRecorder.Instance.SwatchX,


			




        

    



    


    



    



      

      





    
    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