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;