Skip to content

Commit cb60543

Browse files
lesandroglesandrog
authored
2512-V100-Added-borders-KryptonRibbon-in-MS365-themes.-Adjusted-RibbonQATButton (#2527)
Added borders with straight corners (LinearBorder2) and adjusted the colors in the KryptonRibbon in the Microsoft365 themes. Adjusted the design of the RibbonQATButton.
1 parent b0143b1 commit cb60543

26 files changed

+406
-352
lines changed

‎Documents/Changelog/Changelog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
====
44

55
## 2025-11-xx - Build 2511 (V10 - alpha) - November 2025
6+
* Resolved [#2512](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2512), Added borders with straight corners (`LinearBorder2`) and adjusted the colors in the `KryptonRibbon` in the `Microsoft365` themes. Adjusted the design of the `RibbonQATButton`
67
* Implemented [#2503](https://github.com/Krypton-Suite/Standard-Toolkit/issues/2503), Add the ability to create zip files for binaries
78
* Implemented [#952](https://github.com/Krypton-Suite/Standard-Toolkit/issues/952), Place built NuGet packages into separate directory
89
* Implemented [#892](https://github.com/Krypton-Suite/Standard-Toolkit/issues/892), `KryptonButton` UAC Shield icons need to match the OS style

‎Source/Krypton Components/Krypton.Toolkit/Palette Base/PaletteDefinitions.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3975,6 +3975,11 @@ public enum PaletteRibbonColorStyle
39753975
/// </summary>
39763976
LinearBorder,
39773977

3978+
/// <summary>
3979+
/// Specifies linear gradient border from first to second color.
3980+
/// </summary>
3981+
LinearBorder2,
3982+
39783983
/// <summary>
39793984
/// Specifies using colors to draw a application menu inner area.
39803985
/// </summary>

‎Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Bases/PaletteMicrosoft365Base.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3589,9 +3589,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
35893589
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
35903590
return PaletteRibbonColorStyle.RibbonAppMenuOuter;
35913591
case PaletteRibbonBackStyle.RibbonQATMinibar:
3592-
return state == PaletteState.CheckedNormal
3593-
? PaletteRibbonColorStyle.RibbonQATMinibarDouble
3594-
: PaletteRibbonColorStyle.RibbonQATMinibarSingle;
3592+
return PaletteRibbonColorStyle.RibbonQATMinibarDouble;
35953593

35963594
case PaletteRibbonBackStyle.RibbonQATFullbar:
35973595
return PaletteRibbonColorStyle.RibbonQATFullbarSquare;
@@ -3632,6 +3630,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
36323630
{
36333631
case PaletteState.Normal:
36343632
case PaletteState.CheckedNormal:
3633+
return PaletteRibbonColorStyle.LinearBorder2;
36353634
case PaletteState.ContextNormal:
36363635
case PaletteState.ContextCheckedNormal:
36373636
return PaletteRibbonColorStyle.Empty;
@@ -3716,7 +3715,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS
37163715
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
37173716
return _ribbonColors[(int)SchemeBaseColors.AppButtonOuter1];
37183717
case PaletteRibbonBackStyle.RibbonQATMinibar:
3719-
return state == PaletteState.Normal
3718+
return state == PaletteState.CheckedNormal
37203719
? _ribbonColors[(int)SchemeBaseColors.RibbonQATMini1]
37213720
: _ribbonColors[(int)SchemeBaseColors.RibbonQATMini1I];
37223721

@@ -3817,7 +3816,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS
38173816
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
38183817
return _ribbonColors[(int)SchemeBaseColors.AppButtonOuter2];
38193818
case PaletteRibbonBackStyle.RibbonQATMinibar:
3820-
return state == PaletteState.Normal
3819+
return state == PaletteState.CheckedNormal
38213820
? _ribbonColors[(int)SchemeBaseColors.RibbonQATMini2]
38223821
: _ribbonColors[(int)SchemeBaseColors.RibbonQATMini2I];
38233822

@@ -3934,7 +3933,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS
39343933
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
39353934
return _ribbonColors[(int)SchemeBaseColors.AppButtonOuter3];
39363935
case PaletteRibbonBackStyle.RibbonQATMinibar:
3937-
return state == PaletteState.Normal
3936+
return state == PaletteState.CheckedNormal
39383937
? _ribbonColors[(int)SchemeBaseColors.RibbonQATMini3]
39393938
: _ribbonColors[(int)SchemeBaseColors.RibbonQATMini3I];
39403939

@@ -4016,7 +4015,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS
40164015
switch (style)
40174016
{
40184017
case PaletteRibbonBackStyle.RibbonQATMinibar:
4019-
return state == PaletteState.Normal
4018+
return state == PaletteState.CheckedNormal
40204019
? _ribbonColors[(int)SchemeBaseColors.RibbonQATMini4]
40214020
: _ribbonColors[(int)SchemeBaseColors.RibbonQATMini4I];
40224021

@@ -4113,7 +4112,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS
41134112
case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder:
41144113
return _ribbonColors[(int)SchemeBaseColors.RibbonGroupBorder5];
41154114
case PaletteRibbonBackStyle.RibbonQATMinibar:
4116-
return state == PaletteState.Normal
4115+
return state == PaletteState.CheckedNormal
41174116
? _ribbonColors[(int)SchemeBaseColors.RibbonQATMini5]
41184117
: _ribbonColors[(int)SchemeBaseColors.RibbonQATMini5I];
41194118

‎Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeAlternateBase.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3524,9 +3524,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
35243524
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
35253525
return PaletteRibbonColorStyle.RibbonAppMenuOuter;
35263526
case PaletteRibbonBackStyle.RibbonQATMinibar:
3527-
return state == PaletteState.CheckedNormal
3528-
? PaletteRibbonColorStyle.RibbonQATMinibarDouble
3529-
: PaletteRibbonColorStyle.RibbonQATMinibarSingle;
3527+
return PaletteRibbonColorStyle.RibbonQATMinibarDouble;
35303528

35313529
case PaletteRibbonBackStyle.RibbonQATFullbar:
35323530
return PaletteRibbonColorStyle.RibbonQATFullbarSquare;
@@ -3565,6 +3563,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
35653563
{
35663564
case PaletteState.Normal:
35673565
case PaletteState.CheckedNormal:
3566+
return PaletteRibbonColorStyle.LinearBorder2;
35683567
case PaletteState.ContextNormal:
35693568
case PaletteState.ContextCheckedNormal:
35703569
return PaletteRibbonColorStyle.Empty;
@@ -3648,7 +3647,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS
36483647
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
36493648
return BaseColors.AppButtonOuter1;
36503649
case PaletteRibbonBackStyle.RibbonQATMinibar:
3651-
return state == PaletteState.Normal
3650+
return state == PaletteState.CheckedNormal
36523651
? BaseColors.RibbonQATMini1
36533652
: BaseColors.RibbonQATMini1I;
36543653

@@ -3749,7 +3748,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS
37493748
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
37503749
return BaseColors.AppButtonOuter2;
37513750
case PaletteRibbonBackStyle.RibbonQATMinibar:
3752-
return state == PaletteState.Normal
3751+
return state == PaletteState.CheckedNormal
37533752
? BaseColors.RibbonQATMini2
37543753
: BaseColors.RibbonQATMini2I;
37553754

@@ -3866,7 +3865,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS
38663865
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
38673866
return BaseColors.AppButtonOuter3;
38683867
case PaletteRibbonBackStyle.RibbonQATMinibar:
3869-
return state == PaletteState.Normal
3868+
return state == PaletteState.CheckedNormal
38703869
? BaseColors.RibbonQATMini3
38713870
: BaseColors.RibbonQATMini3I;
38723871

@@ -3948,7 +3947,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS
39483947
switch (style)
39493948
{
39503949
case PaletteRibbonBackStyle.RibbonQATMinibar:
3951-
return state == PaletteState.Normal
3950+
return state == PaletteState.CheckedNormal
39523951
? BaseColors.RibbonQATMini4
39533952
: BaseColors.RibbonQATMini4I;
39543953

@@ -4045,7 +4044,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS
40454044
case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder:
40464045
return BaseColors.RibbonGroupBorder5;
40474046
case PaletteRibbonBackStyle.RibbonQATMinibar:
4048-
return state == PaletteState.Normal
4047+
return state == PaletteState.CheckedNormal
40494048
? BaseColors.RibbonQATMini5
40504049
: BaseColors.RibbonQATMini5I;
40514050

‎Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlackDarkModeBase.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static PaletteMicrosoft365BlackDarkModeBase()
175175
private static readonly Color _buttonTextTracking = Color.Black;
176176
private static readonly Color _gridTextColor = Color.White;
177177
private static readonly Color _disabledText2 = Color.FromArgb(166, 166, 166);
178-
private static readonly Color _disabledText = Color.FromArgb(32, 32, 32);
178+
private static readonly Color _disabledText = Color.FromArgb(51, 51, 51);
179179
private static readonly Color _disabledBack = Color.FromArgb(102, 102, 102);
180180
private static readonly Color _disabledBack2 = Color.FromArgb(128, 128, 128);
181181
private static readonly Color _disabledBorder = Color.FromArgb(212, 212, 212);
@@ -3595,9 +3595,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
35953595
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
35963596
return PaletteRibbonColorStyle.RibbonAppMenuOuter;
35973597
case PaletteRibbonBackStyle.RibbonQATMinibar:
3598-
return state == PaletteState.CheckedNormal
3599-
? PaletteRibbonColorStyle.RibbonQATMinibarDouble
3600-
: PaletteRibbonColorStyle.RibbonQATMinibarSingle;
3598+
return PaletteRibbonColorStyle.RibbonQATMinibarDouble;
36013599

36023600
case PaletteRibbonBackStyle.RibbonQATFullbar:
36033601
return PaletteRibbonColorStyle.RibbonQATFullbarSquare;
@@ -3636,6 +3634,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
36363634
{
36373635
case PaletteState.Normal:
36383636
case PaletteState.CheckedNormal:
3637+
return PaletteRibbonColorStyle.LinearBorder2;
36393638
case PaletteState.ContextNormal:
36403639
case PaletteState.ContextCheckedNormal:
36413640
return PaletteRibbonColorStyle.Empty;
@@ -3719,7 +3718,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS
37193718
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
37203719
return BaseColors.AppButtonOuter1;
37213720
case PaletteRibbonBackStyle.RibbonQATMinibar:
3722-
return state == PaletteState.Normal
3721+
return state == PaletteState.CheckedNormal
37233722
? BaseColors.RibbonQATMini1
37243723
: BaseColors.RibbonQATMini1I;
37253724

@@ -3820,7 +3819,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS
38203819
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
38213820
return BaseColors.AppButtonOuter2;
38223821
case PaletteRibbonBackStyle.RibbonQATMinibar:
3823-
return state == PaletteState.Normal
3822+
return state == PaletteState.CheckedNormal
38243823
? BaseColors.RibbonQATMini2
38253824
: BaseColors.RibbonQATMini2I;
38263825

@@ -3937,7 +3936,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS
39373936
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
39383937
return BaseColors.AppButtonOuter3;
39393938
case PaletteRibbonBackStyle.RibbonQATMinibar:
3940-
return state == PaletteState.Normal
3939+
return state == PaletteState.CheckedNormal
39413940
? BaseColors.RibbonQATMini3
39423941
: BaseColors.RibbonQATMini3I;
39433942

@@ -4019,7 +4018,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS
40194018
switch (style)
40204019
{
40214020
case PaletteRibbonBackStyle.RibbonQATMinibar:
4022-
return state == PaletteState.Normal
4021+
return state == PaletteState.CheckedNormal
40234022
? BaseColors.RibbonQATMini4
40244023
: BaseColors.RibbonQATMini4I;
40254024

@@ -4116,7 +4115,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS
41164115
case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder:
41174116
return BaseColors.RibbonGroupBorder5;
41184117
case PaletteRibbonBackStyle.RibbonQATMinibar:
4119-
return state == PaletteState.Normal
4118+
return state == PaletteState.CheckedNormal
41204119
? BaseColors.RibbonQATMini5
41214120
: BaseColors.RibbonQATMini5I;
41224121

‎Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueDarkModeBase.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3469,9 +3469,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
34693469
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
34703470
return PaletteRibbonColorStyle.RibbonAppMenuOuter;
34713471
case PaletteRibbonBackStyle.RibbonQATMinibar:
3472-
return state == PaletteState.CheckedNormal
3473-
? PaletteRibbonColorStyle.RibbonQATMinibarDouble
3474-
: PaletteRibbonColorStyle.RibbonQATMinibarSingle;
3472+
return PaletteRibbonColorStyle.RibbonQATMinibarDouble;
34753473

34763474
case PaletteRibbonBackStyle.RibbonQATFullbar:
34773475
return PaletteRibbonColorStyle.RibbonQATFullbarSquare;
@@ -3510,6 +3508,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
35103508
{
35113509
case PaletteState.Normal:
35123510
case PaletteState.CheckedNormal:
3511+
return PaletteRibbonColorStyle.LinearBorder2;
35133512
case PaletteState.ContextNormal:
35143513
case PaletteState.ContextCheckedNormal:
35153514
return PaletteRibbonColorStyle.Empty;
@@ -3593,7 +3592,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS
35933592
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
35943593
return BaseColors!.AppButtonOuter1;
35953594
case PaletteRibbonBackStyle.RibbonQATMinibar:
3596-
return state == PaletteState.Normal
3595+
return state == PaletteState.CheckedNormal
35973596
? BaseColors!.RibbonQATMini1
35983597
: BaseColors!.RibbonQATMini1I;
35993598

@@ -3694,7 +3693,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS
36943693
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
36953694
return BaseColors!.AppButtonOuter2;
36963695
case PaletteRibbonBackStyle.RibbonQATMinibar:
3697-
return state == PaletteState.Normal
3696+
return state == PaletteState.CheckedNormal
36983697
? BaseColors!.RibbonQATMini2
36993698
: BaseColors!.RibbonQATMini2I;
37003699

@@ -3811,7 +3810,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS
38113810
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
38123811
return BaseColors!.AppButtonOuter3;
38133812
case PaletteRibbonBackStyle.RibbonQATMinibar:
3814-
return state == PaletteState.Normal
3813+
return state == PaletteState.CheckedNormal
38153814
? BaseColors!.RibbonQATMini3
38163815
: BaseColors!.RibbonQATMini3I;
38173816

@@ -3893,7 +3892,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS
38933892
switch (style)
38943893
{
38953894
case PaletteRibbonBackStyle.RibbonQATMinibar:
3896-
return state == PaletteState.Normal
3895+
return state == PaletteState.CheckedNormal
38973896
? BaseColors!.RibbonQATMini4
38983897
: BaseColors!.RibbonQATMini4I;
38993898

@@ -3990,7 +3989,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS
39903989
case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder:
39913990
return BaseColors!.RibbonGroupBorder5;
39923991
case PaletteRibbonBackStyle.RibbonQATMinibar:
3993-
return state == PaletteState.Normal
3992+
return state == PaletteState.CheckedNormal
39943993
? BaseColors!.RibbonQATMini5
39953994
: BaseColors!.RibbonQATMini5I;
39963995

‎Source/Krypton Components/Krypton.Toolkit/Palette Builtin/Microsoft 365/Extra Themes/Bases/PaletteMicrosoft365BlueLightModeBase.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3500,9 +3500,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
35003500
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
35013501
return PaletteRibbonColorStyle.RibbonAppMenuOuter;
35023502
case PaletteRibbonBackStyle.RibbonQATMinibar:
3503-
return state == PaletteState.CheckedNormal
3504-
? PaletteRibbonColorStyle.RibbonQATMinibarDouble
3505-
: PaletteRibbonColorStyle.RibbonQATMinibarSingle;
3503+
return PaletteRibbonColorStyle.RibbonQATMinibarDouble;
35063504

35073505
case PaletteRibbonBackStyle.RibbonQATFullbar:
35083506
return PaletteRibbonColorStyle.RibbonQATFullbarSquare;
@@ -3543,6 +3541,7 @@ public override PaletteRibbonColorStyle GetRibbonBackColorStyle(PaletteRibbonBac
35433541
{
35443542
case PaletteState.Normal:
35453543
case PaletteState.CheckedNormal:
3544+
return PaletteRibbonColorStyle.LinearBorder2;
35463545
case PaletteState.ContextNormal:
35473546
case PaletteState.ContextCheckedNormal:
35483547
return PaletteRibbonColorStyle.Empty;
@@ -3629,7 +3628,7 @@ public override Color GetRibbonBackColor1(PaletteRibbonBackStyle style, PaletteS
36293628
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
36303629
return BaseColors.AppButtonOuter1;
36313630
case PaletteRibbonBackStyle.RibbonQATMinibar:
3632-
return state == PaletteState.Normal
3631+
return state == PaletteState.CheckedNormal
36333632
? BaseColors.RibbonQATMini1
36343633
: BaseColors.RibbonQATMini1I;
36353634

@@ -3732,7 +3731,7 @@ public override Color GetRibbonBackColor2(PaletteRibbonBackStyle style, PaletteS
37323731
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
37333732
return BaseColors.AppButtonOuter2;
37343733
case PaletteRibbonBackStyle.RibbonQATMinibar:
3735-
return state == PaletteState.Normal
3734+
return state == PaletteState.CheckedNormal
37363735
? BaseColors.RibbonQATMini2
37373736
: BaseColors.RibbonQATMini2I;
37383737

@@ -3851,7 +3850,7 @@ public override Color GetRibbonBackColor3(PaletteRibbonBackStyle style, PaletteS
38513850
case PaletteRibbonBackStyle.RibbonAppMenuOuter:
38523851
return BaseColors.AppButtonOuter3;
38533852
case PaletteRibbonBackStyle.RibbonQATMinibar:
3854-
return state == PaletteState.Normal
3853+
return state == PaletteState.CheckedNormal
38553854
? BaseColors.RibbonQATMini3
38563855
: BaseColors.RibbonQATMini3I;
38573856

@@ -3936,7 +3935,7 @@ public override Color GetRibbonBackColor4(PaletteRibbonBackStyle style, PaletteS
39363935
switch (style)
39373936
{
39383937
case PaletteRibbonBackStyle.RibbonQATMinibar:
3939-
return state == PaletteState.Normal
3938+
return state == PaletteState.CheckedNormal
39403939
? BaseColors.RibbonQATMini4
39413940
: BaseColors.RibbonQATMini4I;
39423941

@@ -4037,7 +4036,7 @@ public override Color GetRibbonBackColor5(PaletteRibbonBackStyle style, PaletteS
40374036
case PaletteRibbonBackStyle.RibbonGroupCollapsedBorder:
40384037
return BaseColors.RibbonGroupBorder5;
40394038
case PaletteRibbonBackStyle.RibbonQATMinibar:
4040-
return state == PaletteState.Normal
4039+
return state == PaletteState.CheckedNormal
40414040
? BaseColors.RibbonQATMini5
40424041
: BaseColors.RibbonQATMini5I;
40434042

0 commit comments

Comments
 (0)