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
...
 
@@ -115,5 +115,6 @@ namespace DesertPaintLab
 
        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; }
...
 
@@ -460,4 +461,6 @@ namespace DesertPaintLab
 
            ScreenWidth = screenshotWidth;
 
            ScreenHeight = screenshotHeight;
 
            IsCaptured = false;
 
            _recordedColor.Clear();
 

			




	
	
	
		
 
            IsCaptured = false;


			




        

    


    
    

    

        

                

                    UI/CaptureView.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -289,5 +289,5 @@ namespace DesertPaintLab


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




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


			




	
	
	
		
 
            this.reactionSwatch.Clear();


			




	
	
	
		
 

			




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


			




	...
	
		
 
@@ -421,6 +421,4 @@ namespace DesertPaintLab


			




	
	
	
		
 
                    recordButton.Sensitive = recordEnabled;


			




	
	
	
		
 
                }


			




	
	
	
		
 

			




	
	
	
		
 
                captureButton.Sensitive = false;


			




	
	
	
		
 
            }


			




	
	
	
		
 
            else


			




	...
	
		
 
@@ -443,6 +441,5 @@ namespace DesertPaintLab


			




	
	
	
		
 
            ingredient1ComboBox.Sensitive = true;


			




	
	
	
		
 
            ingredient2ComboBox.Sensitive = true;


			




	
	
	
		
 
            ingredient3ComboBox.Sensitive = false;


			




	
	
	
		
 
            UpdateIngredients();


			




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


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    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