From 786799eb69721ec1dcab6b67df1bbc3ceda2dec1 Mon Sep 17 00:00:00 2001 From: ZX Date: Sat, 22 Jun 2019 10:17:09 +0800 Subject: [PATCH 1/3] Fix a BUG --- src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs index bc72ea0f..985b7003 100644 --- a/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs +++ b/src/Shared/HandyControl_Shared/Controls/Other/Pagination.cs @@ -72,6 +72,7 @@ namespace HandyControl.Controls CommandBindings.Add(new CommandBinding(ControlCommands.Prev, ButtonPrev_OnClick)); CommandBindings.Add(new CommandBinding(ControlCommands.Next, ButtonNext_OnClick)); CommandBindings.Add(new CommandBinding(ControlCommands.Selected, ToggleButton_OnChecked)); + this.Show(MaxPageCount > 1); } #region Public Properties From dead8e1a41728a65b1aca45822e3b488506bd892 Mon Sep 17 00:00:00 2001 From: ZX Date: Sat, 22 Jun 2019 10:45:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Styles/Base/TabControlBaseStyle.xaml | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml index 77b749f4..ca832f90 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/TabControlBaseStyle.xaml @@ -64,33 +64,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - From c3dcb921f31ad4fe0015a535c0a72e0a270f376c Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Sat, 22 Jun 2019 23:09:36 +0800 Subject: [PATCH 3/3] AppVeyor Test --- .../HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj | 2 +- src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj | 2 +- .../HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj | 2 +- src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj | 2 +- .../HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj | 2 +- src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index 0d272ccf..f9dad817 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -11,7 +11,7 @@ Copyright © HandyOrg 2018-2019 2.0.0.0 2.0.0.0 - default + latest TRACE;Core diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj index 45ce9fb0..34c1ddeb 100644 --- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj +++ b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj @@ -11,7 +11,7 @@ Copyright © HandyOrg 2018-2019 Contains some commonly used simple WPF controls Debug;Release - default + latest TRACE;Core diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index 0dd1ca69..39ce5905 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -26,7 +26,7 @@ prompt 4 v4.0 - default + latest AnyCPU diff --git a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj index dccb1c9b..0ea83fbe 100644 --- a/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj +++ b/src/Net_40/HandyControl_Net_40/HandyControl_Net_40.csproj @@ -23,7 +23,7 @@ prompt 4 v4.0 - default + latest pdbonly diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index 68202dc2..b78eac34 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -60,7 +60,7 @@ prompt 4 v4.8 - default + latest AnyCPU diff --git a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj index fae23051..d608122e 100644 --- a/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj +++ b/src/Net_GE45/HandyControl_Net_GE45/HandyControl_Net_GE45.csproj @@ -58,7 +58,7 @@ 4 v4.8 netgt40 - default + latest pdbonly