Merge pull request #90 from cwensley/fix-windows-brush-editor-always-…

…showing Fix issue showing the brush editor constantly after it was opened
cwensley · Apr 15, 2023 · c1df6fe · c1df6fe
2 parents 10bde55 + 65f243e
commit c1df6fe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/Source/Pablo.Interface/Pablo.Interface.csproj b/Source/Pablo.Interface/Pablo.Interface.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(EtoBasePath)src\Eto\Eto.csproj" Condition="$(EtoBasePath) != ''" />
-    <PackageReference Include="Eto.Forms" Version="2.7.1" Condition="$(EtoBasePath) == ''" />
+    <PackageReference Include="Eto.Forms" Version="2.7.4" Condition="$(EtoBasePath) == ''" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Source/Pablo/Formats/Character/Controls/BrushPad.cs b/Source/Pablo/Formats/Character/Controls/BrushPad.cs
@@ -95,10 +95,12 @@ Control GradientPreview()
 				ReadOnly = true,
 				Bordered = true
 			};
-			control.MouseDown += (sender, e) =>
+			control.MouseDown += (sender, e) => e.Handled = true;
+			control.MouseUp += (sender, e) =>
 			{
-				EditBrushes();
 				e.Handled = true;
+				if (new Rectangle(control.Size).Contains((Point)e.Location))
+					EditBrushes();
 			};
 			return control;
 		}

diff --git a/Source/Pablo/Pablo.csproj b/Source/Pablo/Pablo.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(EtoBasePath)src\Eto\Eto.csproj" Condition="$(EtoBasePath) != ''" />
-    <PackageReference Include="Eto.Forms" Version="2.7.1" Condition="$(EtoBasePath) == ''" />
+    <PackageReference Include="Eto.Forms" Version="2.7.4" Condition="$(EtoBasePath) == ''" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="sharpcompress" Version="0.32.2" />
     <PackageReference Include="Mono.Nat" Version="3.0.3" />

diff --git a/Source/PabloDraw/PabloDraw.csproj b/Source/PabloDraw/PabloDraw.csproj
@@ -82,12 +82,12 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(EtoBasePath) == ''">
-    <PackageReference Include="Eto.Forms" Version="2.7.1" />
-    <PackageReference Include="Eto.Platform.Gtk" Version="2.7.1" Condition="$(BuildTarget) == 'Linux'" />
-    <PackageReference Include="Eto.Platform.Mac64" Version="2.7.1" Condition="$(BuildTarget) == 'Mac'" />
-    <PackageReference Include="Eto.Platform.Windows" Version="2.7.1" Condition="$(BuildTarget) == 'Windows'" />
-    <!-- <PackageReference Include="Eto.Platform.Gtk2" Version="2.7.1" Condition="$(BuildTarget) == 'Linux'" /> -->
-    <!-- <PackageReference Include="Eto.Platform.Wpf" Version="2.7.1" Condition="$(BuildTarget) == 'Windows'" /> -->
+    <PackageReference Include="Eto.Forms" Version="2.7.4" />
+    <PackageReference Include="Eto.Platform.Gtk" Version="2.7.4" Condition="$(BuildTarget) == 'Linux'" />
+    <PackageReference Include="Eto.Platform.Mac64" Version="2.7.4" Condition="$(BuildTarget) == 'Mac'" />
+    <PackageReference Include="Eto.Platform.Windows" Version="2.7.4" Condition="$(BuildTarget) == 'Windows'" />
+    <!-- <PackageReference Include="Eto.Platform.Gtk2" Version="2.7.4" Condition="$(BuildTarget) == 'Linux'" /> -->
+    <!-- <PackageReference Include="Eto.Platform.Wpf" Version="2.7.4" Condition="$(BuildTarget) == 'Windows'" /> -->
   </ItemGroup>
 
   <ItemGroup>