- fixed restoring of selected font size

- set default font size delta to +1 (Segoe UI 9)
- fixed focused row / inactive selected rows to use the selected font size
This commit is contained in:
Horst Beham
2021-07-26 00:38:15 +02:00
parent 36ce58ea15
commit 7b6ef1219f
4 changed files with 14 additions and 15 deletions

View File

@@ -306,7 +306,7 @@
//
// gviewLeft
//
this.gviewLeft.Appearance.FocusedRow.Font = ((System.Drawing.Font)(resources.GetObject("gviewLeft.Appearance.FocusedRow.Font")));
this.gviewLeft.Appearance.FocusedRow.FontStyleDelta = ((System.Drawing.FontStyle)(resources.GetObject("gviewLeft.Appearance.FocusedRow.FontStyleDelta")));
this.gviewLeft.Appearance.FocusedRow.Options.UseFont = true;
this.gviewLeft.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gviewLeft.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
@@ -629,7 +629,7 @@
//
// gviewRight
//
this.gviewRight.Appearance.FocusedRow.Font = ((System.Drawing.Font)(resources.GetObject("gviewRight.Appearance.FocusedRow.Font")));
this.gviewRight.Appearance.FocusedRow.FontStyleDelta = ((System.Drawing.FontStyle)(resources.GetObject("gviewRight.Appearance.FocusedRow.FontStyleDelta")));
this.gviewRight.Appearance.FocusedRow.Options.UseFont = true;
this.gviewRight.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gviewRight.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;

View File

@@ -62,7 +62,6 @@ namespace ChanSort.Ui
{
if (!string.IsNullOrEmpty(Config.Default.Language))
Thread.CurrentThread.CurrentUICulture = new CultureInfo(Config.Default.Language);
//this.LookAndFeel.SetSkinStyle("Office 2010 Blue");
UserLookAndFeel.Default.SkinName = Config.Default.SkinName;
InitializeComponent();
@@ -3345,7 +3344,7 @@ namespace ChanSort.Ui
return;
}
if (deltaSize == Config.Default.FontSizeDelta) // no change => early exit
if (deltaSize == Config.Default.FontSizeDelta && deltaSize == 0) // no change => early exit
return;
var font = new Font(deltaSize == 0 ? "Tahoma" : "Segoe UI", 8.25f + deltaSize);

View File

@@ -134,8 +134,8 @@
<data name="gridLeft.Location" type="System.Drawing.Point, System.Drawing">
<value>2, 56</value>
</data>
<data name="gviewLeft.Appearance.FocusedRow.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt, style=Bold</value>
<data name="gviewLeft.Appearance.FocusedRow.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
<value>Bold</value>
</data>
<data name="gviewLeft.Appearance.HideSelectionRow.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt, style=Bold</value>
@@ -279,7 +279,7 @@
<value>gridLeft</value>
</data>
<data name="&gt;&gt;gridLeft.Type" xml:space="preserve">
<value>ChanSort.XGridControl, ChanSort, Version=1.0.7876.42315, Culture=neutral, PublicKeyToken=null</value>
<value>ChanSort.XGridControl, ChanSort, Version=1.0.7877.752, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;gridLeft.Parent" xml:space="preserve">
<value>grpOutputList</value>
@@ -1210,7 +1210,7 @@
<value>gviewLeft</value>
</data>
<data name="&gt;&gt;gviewLeft.Type" xml:space="preserve">
<value>ChanSort.XGridView, ChanSort, Version=1.0.7876.42315, Culture=neutral, PublicKeyToken=null</value>
<value>ChanSort.XGridView, ChanSort, Version=1.0.7877.752, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;colIndex1.Name" xml:space="preserve">
<value>colIndex1</value>
@@ -1294,13 +1294,13 @@
<value>globalImageCollection1</value>
</data>
<data name="&gt;&gt;globalImageCollection1.Type" xml:space="preserve">
<value>ChanSort.Ui.GlobalImageCollection, ChanSort, Version=1.0.7876.42315, Culture=neutral, PublicKeyToken=null</value>
<value>ChanSort.Ui.GlobalImageCollection, ChanSort, Version=1.0.7877.752, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;gviewRight.Name" xml:space="preserve">
<value>gviewRight</value>
</data>
<data name="&gt;&gt;gviewRight.Type" xml:space="preserve">
<value>ChanSort.XGridView, ChanSort, Version=1.0.7876.42315, Culture=neutral, PublicKeyToken=null</value>
<value>ChanSort.XGridView, ChanSort, Version=1.0.7877.752, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;colIndex.Name" xml:space="preserve">
<value>colIndex</value>
@@ -2053,7 +2053,7 @@
<value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v21.1, Version=21.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="SharedImageCollection.Timestamp" type="System.DateTime, mscorlib">
<value>07/25/2021 23:42:00</value>
<value>07/26/2021 00:31:08</value>
</data>
<data name="SharedImageCollection.ImageSize" type="System.Drawing.Size, System.Drawing">
<value>16, 16</value>
@@ -2556,8 +2556,8 @@
<data name="gridRight.Location" type="System.Drawing.Point, System.Drawing">
<value>2, 56</value>
</data>
<data name="gviewRight.Appearance.FocusedRow.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt, style=Bold</value>
<data name="gviewRight.Appearance.FocusedRow.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
<value>Bold</value>
</data>
<data name="gviewRight.Appearance.HideSelectionRow.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt, style=Bold</value>
@@ -2927,7 +2927,7 @@
<value>gridRight</value>
</data>
<data name="&gt;&gt;gridRight.Type" xml:space="preserve">
<value>ChanSort.XGridControl, ChanSort, Version=1.0.7876.42315, Culture=neutral, PublicKeyToken=null</value>
<value>ChanSort.XGridControl, ChanSort, Version=1.0.7877.752, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;gridRight.Parent" xml:space="preserve">
<value>grpInputList</value>

View File

@@ -52,7 +52,7 @@ namespace ChanSort.Ui.Properties
public int PrintColumnCount { get; set; } = 2;
public bool ExplorerIntegration { get; set; } = false;
public bool CheckForUpdates { get; set; } = true;
public int FontSizeDelta { get; set; }
public int FontSizeDelta { get; set; } = 1;
public string LeftGridLayout { get; set; }
public string RightGridLayout { get; set; }