nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move theme image adjustment functionality into StaticData.LoadIcon

Browse source
This commit is contained in:
John Lewin 2017-10-14 23:18:06 -07:00
parent dc4aa1d03a
commit 145ef1ad63
22 changed files with 69 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Library/Widgets/ExpandCheckboxButton.cs
View file

@ -52,14 +52,8 @@ namespace MatterHackers.MatterControl.PrintLibrary
this.VAnchor = VAnchor.Fit;
this.Padding = new BorderDouble(left: 2, bottom: 2, top: 6); // Same padding as toolbar above
arrowRight = AggContext.StaticData.LoadIcon("fa-angle-right_12.png");
arrowDown = AggContext.StaticData.LoadIcon("fa-angle-down_12.png");
if (ActiveTheme.Instance.IsDarkTheme)
{
arrowRight = arrowRight.InvertLightness();
arrowDown = arrowDown.InvertLightness();
}
arrowRight = AggContext.StaticData.LoadIcon("fa-angle-right_12.png", IconColor.Theme);
arrowDown = AggContext.StaticData.LoadIcon("fa-angle-down_12.png", IconColor.Theme);
var theme = ApplicationController.Instance.Theme;

2
Library/Widgets/PrintLibraryWidget.cs
View file

@ -136,7 +136,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
navBar.AddChild(searchPanel);
var searchButton = theme.ButtonFactory.GenerateIconButton(AggContext.StaticData.LoadIcon("icon_search_24x24.png", 16, 16));
var searchButton = theme.ButtonFactory.GenerateIconButton(AggContext.StaticData.LoadIcon("icon_search_24x24.png", 16, 16, IconColor.Theme));
searchButton.Name = "Search Library Button";
searchButton.ToolTipText = "Search".Localize();
searchButton.Click += (s, e) =>