From 073b782bcff610f4cc4a8f1e4b52a2efaf46389d Mon Sep 17 00:00:00 2001 From: Sunny Date: Wed, 30 Aug 2023 16:17:12 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E9=87=8D=E6=9E=84=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=AD=97=E4=BD=93=E8=AE=BE=E7=BD=AE=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E6=9C=9F=E5=8F=AF=E4=BB=A5=E5=9C=A8=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E8=AE=BE=E7=BD=AE=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=AD=97=E4=BD=93=20*=20UIPagination:=20=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=8C=89=E9=92=AE=E7=9A=84=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=8D=A2=E6=88=90=E5=AD=97=E4=BD=93=E5=9B=BE=E6=A0=87=20*=20UI?= =?UTF-8?q?MiniPagination:=20=E5=B7=A6=E5=8F=B3=E8=B7=B3=E8=BD=AC=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E6=96=87=E5=AD=97=E6=8D=A2=E6=88=90=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DropItem/UIComboDataGridViewItem.cs | 1 + .../Controls/DropItem/UIComboTreeViewItem.cs | 1 + SunnyUI/Controls/UIComboDataGridView.cs | 10 ------ SunnyUI/Controls/UIComboTreeView.cs | 10 ------ SunnyUI/Controls/UIMiniPagination.cs | 33 ++++++++++--------- SunnyUI/Controls/UIPagination.cs | 26 +++++++-------- 6 files changed, 32 insertions(+), 49 deletions(-) diff --git a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs index 94ad051a..75779a6f 100644 --- a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs +++ b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs @@ -76,6 +76,7 @@ namespace Sunny.UI btnClear.SetDPIScale(); btnOK.SetDPIScale(); btnCancel.SetDPIScale(); + dataGridView.SetDPIScale(); } public void Translate() diff --git a/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs b/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs index 0d379e7b..98db5623 100644 --- a/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs +++ b/SunnyUI/Controls/DropItem/UIComboTreeViewItem.cs @@ -18,6 +18,7 @@ namespace Sunny.UI if (DesignMode) return; if (!UIDPIScale.NeedSetDPIFont()) return; + treeView.SetDPIScale(); btnOK.SetDPIScale(); btnCancel.SetDPIScale(); uiCheckBox1.SetDPIScale(); diff --git a/SunnyUI/Controls/UIComboDataGridView.cs b/SunnyUI/Controls/UIComboDataGridView.cs index e1bab072..bb47db80 100644 --- a/SunnyUI/Controls/UIComboDataGridView.cs +++ b/SunnyUI/Controls/UIComboDataGridView.cs @@ -140,16 +140,6 @@ namespace Sunny.UI return edit; } - /// - /// 重载字体变更 - /// - /// 参数 - protected override void OnFontChanged(EventArgs e) - { - base.OnFontChanged(e); - if (item != null) item.DataGridView.Font = Font; - } - [DefaultValue(false)] public bool ShowFilter { get; set; } diff --git a/SunnyUI/Controls/UIComboTreeView.cs b/SunnyUI/Controls/UIComboTreeView.cs index 39b16a0b..827c5f59 100644 --- a/SunnyUI/Controls/UIComboTreeView.cs +++ b/SunnyUI/Controls/UIComboTreeView.cs @@ -118,16 +118,6 @@ namespace Sunny.UI TreeView.Nodes.Clear(); } - /// - /// 重载字体变更 - /// - /// 参数 - protected override void OnFontChanged(EventArgs e) - { - base.OnFontChanged(e); - if (item != null) item.TreeView.Font = Font; - } - [Browsable(false)] public UITreeView TreeView => item.TreeView; diff --git a/SunnyUI/Controls/UIMiniPagination.cs b/SunnyUI/Controls/UIMiniPagination.cs index aee7ab1c..ce0ce084 100644 --- a/SunnyUI/Controls/UIMiniPagination.cs +++ b/SunnyUI/Controls/UIMiniPagination.cs @@ -19,6 +19,7 @@ * 2023-02-19: V3.3.2 新增迷你分页控件，只有分页按钮，无其他 * 2023-06-14: V3.3.9 按钮图标位置修正 * 2023-06-27: V3.3.9 内置按钮关联值由Tag改为TagString + * 2023-08-30: V3.4.2 左右跳转按钮的文字换成字体图标 ******************************************************************************/ using System; @@ -138,17 +139,16 @@ namespace Sunny.UI } } - /// - /// 重载字体变更 - /// - /// 参数 - protected override void OnFontChanged(EventArgs e) + public override void SetDPIScale() { - base.OnFontChanged(e); - foreach (var item in this.GetControls(true)) item.Font = Font; - foreach (var item in this.GetControls(true)) item.Font = Font; - foreach (var item in this.GetControls(true)) item.Font = Font; - foreach (var item in this.GetControls(true)) item.Font = Font; + base.SetDPIScale(); + if (DesignMode) return; + if (!UIDPIScale.NeedSetDPIFont()) return; + + foreach (var item in this.GetControls(true)) item.SetDPIScale(); + foreach (var item in this.GetControls(true)) item.SetDPIScale(); + foreach (var item in this.GetControls(true)) item.SetDPIScale(); + foreach (var item in this.GetControls(true)) item.SetDPIScale(); } private int buttonInterval = 8; @@ -292,8 +292,8 @@ namespace Sunny.UI var btn = (UISymbolButton)sender; if (btn.TagString == "<<" || btn.TagString == ">>") { - btn.Symbol = 0; - btn.Text = @"···"; + btn.Symbol = 361761; + btn.Text = ""; } } @@ -302,13 +302,13 @@ namespace Sunny.UI var btn = (UISymbolButton)sender; if (btn.TagString == "<<") { - btn.Symbol = 61696; + btn.Symbol = 361696; btn.Text = ""; } if (btn.TagString == ">>") { - btn.Symbol = 61697; + btn.Symbol = 361697; btn.Text = ""; } } @@ -624,8 +624,9 @@ namespace Sunny.UI private void SetShowButton(int buttonIdx, int addCount, string tagString) { - buttons[buttonIdx].Symbol = 0; - buttons[buttonIdx].Text = @"···"; + buttons[buttonIdx].Symbol = 361761; + buttons[buttonIdx].Text = ""; + buttons[buttonIdx].SymbolOffset = new Point(-1, 1); buttonTags[buttons[buttonIdx]] = addCount; buttons[buttonIdx].Visible = true; buttons[buttonIdx].TagString = tagString; diff --git a/SunnyUI/Controls/UIPagination.cs b/SunnyUI/Controls/UIPagination.cs index 49c47de1..efd9b33e 100644 --- a/SunnyUI/Controls/UIPagination.cs +++ b/SunnyUI/Controls/UIPagination.cs @@ -20,6 +20,7 @@ * 2021-03-27: V3.0.2 修正因两次查询数量相等而引起的不刷新 * 2021-07-10: V3.0.4 设置总数在页面不超过总页数的情况下不刷新 * 2023-06-27: V3.3.9 内置按钮关联值由Tag改为TagString + * 2023-08-30: V3.4.2 左右跳转按钮的文字换成字体图标 ******************************************************************************/ using System; @@ -133,18 +134,16 @@ namespace Sunny.UI p1.FillColor = p1.RectColor = color; } - /// - /// 重载字体变更 - /// - /// 参数 - protected override void OnFontChanged(EventArgs e) + public override void SetDPIScale() { - base.OnFontChanged(e); + base.SetDPIScale(); + if (DesignMode) return; + if (!UIDPIScale.NeedSetDPIFont()) return; + foreach (var item in this.GetControls(true)) item.SetDPIScale(); foreach (var item in this.GetControls(true)) item.SetDPIScale(); foreach (var item in this.GetControls(true)) item.SetDPIScale(); foreach (var item in this.GetControls(true)) item.SetDPIScale(); - Translate(); } public void Translate() @@ -330,8 +329,8 @@ namespace Sunny.UI var btn = (UISymbolButton)sender; if (btn.TagString == "<<" || btn.TagString == ">>") { - btn.Symbol = 0; - btn.Text = @"···"; + btn.Symbol = 361761; + btn.Text = ""; } } @@ -340,13 +339,13 @@ namespace Sunny.UI var btn = (UISymbolButton)sender; if (btn.TagString == "<<") { - btn.Symbol = 61696; + btn.Symbol = 361696; btn.Text = ""; } if (btn.TagString == ">>") { - btn.Symbol = 61697; + btn.Symbol = 361697; btn.Text = ""; } } @@ -770,8 +769,9 @@ namespace Sunny.UI private void SetShowButton(int buttonIdx, int addCount, string tagString) { - buttons[buttonIdx].Symbol = 0; - buttons[buttonIdx].Text = @"···"; + buttons[buttonIdx].Symbol = 361761; + buttons[buttonIdx].Text = ""; + buttons[buttonIdx].SymbolOffset = new Point(-1, 1); buttonTags[buttons[buttonIdx]] = addCount; buttons[buttonIdx].Visible = true; buttons[buttonIdx].TagString = tagString;