Guest User

Untitled

a guest
May 24th, 2021
103
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/Source/Ribbon/Themes/XTPRibbonThemeOffice2013.cpp b/Source/Ribbon/Themes/XTPRibbonThemeOffice2013.cpp
  2. index 9b4fcf6..775a414 100644
  3. --- a/Source/Ribbon/Themes/XTPRibbonThemeOffice2013.cpp
  4. +++ b/Source/Ribbon/Themes/XTPRibbonThemeOffice2013.cpp
  5. @@ -225,6 +225,16 @@ CXTPRibbonOffice2013Theme::CThemeStaticExtension::CThemeStaticExtension()
  6. _T("SystemPopupBarEntryBackBrush"),
  7. RGB(255, 255, 255))));
  8.  
  9. + // dbrookes, Add some better group popup border to ribbon XAML static extension.
  10. + pColors->Extend(new CXTPMarkupStaticExtensionBrushProperty(L"GroupPopupBorderBack",
  11. + XTPIniColor(_T("CommandBars"),
  12. + _T("ComboBoxBack"),
  13. + RGB(255, 255, 255))));
  14. + pColors->Extend(new CXTPMarkupStaticExtensionBrushProperty(L"GroupPopupBorderBorder",
  15. + XTPIniColor(_T("CommandBars"),
  16. + _T("ComboBoxBorder"),
  17. + RGB(255, 255, 255))));
  18. +
  19. Extend(pColors);
  20. }
  21.  
  22. diff --git a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupNormal.xaml b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupNormal.xaml
  23. index 4912455..3ab9f3f 100644
  24. --- a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupNormal.xaml
  25. +++ b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupNormal.xaml
  26. @@ -1,3 +1,5 @@
  27. <Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
  28. <Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupNormalBrush}' />
  29. +
  30. + <Border Width='32' Height='32' VerticalAlignment='Top' Margin='0,2,0,0' BorderThickness='1' Background='{x:Static Theme.Colors.GroupPopupBorderBack}' BorderBrush='{x:Static Theme.Colors.GroupPopupBorderBorder}' />
  31. </Grid>
  32. diff --git a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupPopuped.xaml b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupPopuped.xaml
  33. index ba4fc96..7c07038 100644
  34. --- a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupPopuped.xaml
  35. +++ b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupPopuped.xaml
  36. @@ -1,3 +1,7 @@
  37. <Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
  38. - <Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupPopupedBorderBrush}' Background='{x:Static Theme.Colors.GroupPopupPopupedBackBrush}' />
  39. + <Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupNormalBrush}' />
  40. +
  41. + <Border Margin='0,0,3,0' Background='{x:Static Theme.Colors.GroupPopupPopupedBackBrush}' />
  42. +
  43. + <Border Width='32' Height='32' VerticalAlignment='Top' Margin='0,2,0,0' BorderThickness='1' Background='{x:Static Theme.Colors.GroupPopupBorderBack}' BorderBrush='{x:Static Theme.Colors.GroupPopupBorderBorder}' />
  44. </Grid>
  45. diff --git a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupSelected.xaml b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupSelected.xaml
  46. index bee2559..212030d 100644
  47. --- a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupSelected.xaml
  48. +++ b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupSelected.xaml
  49. @@ -1,3 +1,7 @@
  50. <Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
  51. - <Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupSelectedBorderBrush}' Background='{x:Static Theme.Colors.GroupPopupSelectedBackBrush}' />
  52. + <Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupNormalBrush}' />
  53. +
  54. + <Border Margin='0,0,3,0' Background='{x:Static Theme.Colors.GroupPopupSelectedBackBrush}' />
  55. +
  56. + <Border Width='32' Height='32' VerticalAlignment='Top' Margin='0,2,0,0' BorderThickness='1' Background='{x:Static Theme.Colors.GroupPopupBorderBack}' BorderBrush='{x:Static Theme.Colors.GroupPopupBorderBorder}' />
  57. </Grid>
  58.  
RAW Paste Data