Skip to content

Commit

Permalink
Frontend.XF.Gtk: use DotNetForms fork for GTK platform
Browse files Browse the repository at this point in the history
Replaces Xamarin.Forms.Platform.GTK library with
DotNetForms.Platform.GTK fork so we can use Shapes API
implementation that is present on that fork for our
ChartView on GTK platform.
  • Loading branch information
aarani authored and knocte committed Dec 10, 2021
1 parent 3d16590 commit 2a46852
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/GWallet.Frontend.XF.Gtk/GWallet.Frontend.XF.Gtk.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
<HintPath>..\..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll</HintPath>
</Reference>
<Reference Include="webkit-sharp">
<HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2012\lib\net45\webkit-sharp.dll</HintPath>
<HintPath>..\..\packages\DotNetForms.Platform.GTK.5.0.0.2012--date20210503-1253.git-51b76c7\lib\net45\webkit-sharp.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.GTK">
<HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2012\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
<HintPath>..\..\packages\DotNetForms.Platform.GTK.5.0.0.2012--date20210503-1253.git-51b76c7\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
</Reference>
<Reference Include="System.Buffers">
<HintPath>..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion src/GWallet.Frontend.XF.Gtk/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="Xamarin.Forms" version="5.0.0.2012" targetFramework="net471" />
<package id="Xamarin.Forms.Platform.GTK" version="5.0.0.2012" targetFramework="net471" />
<package id="DotNetForms.Platform.GTK" version="5.0.0.2012--date20210503-1253.git-51b76c7" targetFramework="net471" />
<package id="ZXing.Net.Xamarin" version="0.10.0-date20191006-0346.git-18fb927" targetFramework="net461" />
<package id="ZXing.Net.Xamarin.Forms" version="0.10.0-date20191006-0346.git-18fb927" targetFramework="net461" />
</packages>
6 changes: 1 addition & 5 deletions src/GWallet.Frontend.XF/Controls/CircleChartView.fs
Original file line number Diff line number Diff line change
Expand Up @@ -483,11 +483,7 @@ type CircleChartView () =
match nonZeroItems with
| None -> ()
| Some items when items.Any() ->
// GTK doesn't have a Shapes implementation
if Device.RuntimePlatform = Device.GTK then
self.DrawSvgBasedPie width height items
else
self.DrawShapesBasedPie width height items
self.DrawShapesBasedPie width height items
| Some _ ->
self.CreateAndSetImageSource self.DefaultImageSource

Expand Down

0 comments on commit 2a46852

Please sign in to comment.