From e293e30174b613808b9c20d78e80f975d3d8830f Mon Sep 17 00:00:00 2001 From: linzhijun Date: Thu, 26 Sep 2024 22:40:52 +0800 Subject: [PATCH 1/2] MaterialForm displays title when FormStyles = ActionBar_None --- src/ReaLTaiizor/Forms/Form/MaterialForm.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/ReaLTaiizor/Forms/Form/MaterialForm.cs b/src/ReaLTaiizor/Forms/Form/MaterialForm.cs index 79a4cb06..99bc7a27 100644 --- a/src/ReaLTaiizor/Forms/Form/MaterialForm.cs +++ b/src/ReaLTaiizor/Forms/Form/MaterialForm.cs @@ -1344,6 +1344,16 @@ protected override void OnPaint(PaintEventArgs e) textLocation.Size, MaterialNativeTextRenderer.TextAlignFlags.Left | MaterialNativeTextRenderer.TextAlignFlags.Middle); } + else if (ControlBox == true && _formStyle == FormStyles.ActionBar_None) + { + using MaterialNativeTextRenderer NativeText = new(g); + Rectangle textLocation = new(12, 5, ClientSize.Width, ClientSize.Height); + NativeText.DrawTransparentText(Text, SkinManager.GetLogFontByType(MaterialSkinManager.FontType.Caption), + SkinManager.ColorScheme.TextColor, + textLocation.Location, + textLocation.Size, + MaterialNativeTextRenderer.TextAlignFlags.Left | MaterialNativeTextRenderer.TextAlignFlags.Top); + } } #endregion From ecdea1e26ebd02fa657a7ac678c9e4c658f278f8 Mon Sep 17 00:00:00 2001 From: Taiizor Date: Fri, 15 Nov 2024 22:12:52 +0300 Subject: [PATCH 2/2] Update MaterialForm.cs --- src/ReaLTaiizor/Forms/Form/MaterialForm.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ReaLTaiizor/Forms/Form/MaterialForm.cs b/src/ReaLTaiizor/Forms/Form/MaterialForm.cs index 99bc7a27..ee31db7a 100644 --- a/src/ReaLTaiizor/Forms/Form/MaterialForm.cs +++ b/src/ReaLTaiizor/Forms/Form/MaterialForm.cs @@ -1348,7 +1348,7 @@ protected override void OnPaint(PaintEventArgs e) { using MaterialNativeTextRenderer NativeText = new(g); Rectangle textLocation = new(12, 5, ClientSize.Width, ClientSize.Height); - NativeText.DrawTransparentText(Text, SkinManager.GetLogFontByType(MaterialSkinManager.FontType.Caption), + NativeText.DrawTransparentText(Text, SkinManager.GetLogFontByType(MaterialSkinManager.FontType.Subtitle2), SkinManager.ColorScheme.TextColor, textLocation.Location, textLocation.Size, @@ -1419,4 +1419,4 @@ private static IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong } #endregion -} \ No newline at end of file +}