Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme: Update a lot of control styles #193

Merged
merged 4 commits into from
Nov 6, 2018

Conversation

EchterAgo
Copy link
Contributor

@EchterAgo EchterAgo commented Jun 19, 2016

This commit generally improves the dark theme and also adds better control
styles to the Button, CheckBox, ColorPicker, ComboBox, ScrollBar, Slider,
TextBox and TreeView controls. In the theme implementation the resources
got moved from ApplicationResources to MainWindowResources so that the
settings window is not affected by the theme change.

Signed-off-by: Axel Gembe [email protected]

@EchterAgo EchterAgo force-pushed the big_theme_update branch 2 times, most recently from 11de0bd to b52c34f Compare June 19, 2016 04:03
@EchterAgo
Copy link
Contributor Author

Some examples

2016-06-19 11_22_55-greenshot
2016-06-19 11_23_14-greenshot
2016-06-19 11_22_01-greenshot

@EchterAgo
Copy link
Contributor Author

And 2 custom themes I made, if there is interest I will share them

Pink ;)

2016-06-19 11_23_25-greenshot

Dark green

2016-06-19 11_23_58-greenshot

@tgjones
Copy link
Owner

tgjones commented Jun 22, 2016

Why don't you want the settings window to be affected by theme changes? I would have thought it's nice to have all the application windows follow a consistent theme.

@EchterAgo
Copy link
Contributor Author

I would like that too, but then i need to style some more controls first. Also, Visual Studios settings window is not themed.

@tgjones
Copy link
Owner

tgjones commented Jun 22, 2016

Also, Visual Studios settings window is not themed.

I did read somewhere that the VS team does want the settings window to be themed, they just haven't gotten to it yet.

@EchterAgo EchterAgo force-pushed the big_theme_update branch 2 times, most recently from 4079489 to 81c9334 Compare June 23, 2016 00:29
@EchterAgo
Copy link
Contributor Author

Removed dependency on #192

@EchterAgo EchterAgo force-pushed the big_theme_update branch 2 times, most recently from d7c1a8f to d4337fe Compare June 27, 2016 10:06
@EchterAgo
Copy link
Contributor Author

I changed it so that the settings window should be themed now too. Also, a rebuilt version of the VS2013 theme would be needed as I made a fix there too.

@tgjones
Copy link
Owner

tgjones commented Jun 27, 2016

Also, a rebuilt version of the VS2013 theme would be needed as I made a fix there too.

Do you want to include a new build of AvalonDock.Themes.VS2013.dll in the lib folder here in Gemini, as part of this PR?

@tgjones
Copy link
Owner

tgjones commented Jun 27, 2016

I changed it so that the settings window should be themed now too.

Great, thank you!

@EchterAgo
Copy link
Contributor Author

OK, I will add a rebuilt AvalonDock.Themes.VS2013.dll soon

@EchterAgo EchterAgo force-pushed the big_theme_update branch 3 times, most recently from 8dcc3a5 to 1e6929f Compare July 1, 2016 03:17
@EchterAgo
Copy link
Contributor Author

Library is updated now, also added a new style for TextBlock and updated the button styles slightly to better fit.

@EchterAgo
Copy link
Contributor Author

I fixed some wrong styles, improved others and added a complete theme for the color picker

@tgjones
Copy link
Owner

tgjones commented Jul 6, 2016

Thanks for updating this. I've had a chance to try it out, and it looks great. I did notice a couple of issues though:

  • Light theme - document and tool selected tab titles have the wrong text colour (it should be white, but it's black).
  • Blue theme - document and tool unselected tab titles have the wrong text colour (it should be white, but it's black)
  • Light and blue themes - status bar text, I think it should be white, but it's black

@EchterAgo
Copy link
Contributor Author

I will look into it. I also noticed selected tabs can not be closed properly as the button is missing.

@EchterAgo EchterAgo force-pushed the big_theme_update branch 2 times, most recently from ef4e240 to 4e8f960 Compare July 7, 2016 04:15
@EchterAgo
Copy link
Contributor Author

EchterAgo commented Jul 7, 2016

Yea, I think I shouldn't style TextBlock but Label instead. So far I had problems getting my Label style to work though.

@EchterAgo EchterAgo force-pushed the big_theme_update branch 2 times, most recently from 653a0e2 to d960806 Compare July 7, 2016 07:00
@EchterAgo
Copy link
Contributor Author

OK, everything is fixed now. The close button issue seems to have been caused by my updated VS2013 theme library. I removed it from the commit until I figure out what is wrong.

@EchterAgo
Copy link
Contributor Author

The issue with the close button seems to be caused by this commit:
4ux-nbIx/AvalonDock.Themes.VS2013@32ad416

@EchterAgo
Copy link
Contributor Author

I fixed the issue and submitted a pull request upstream. I've also included a rebuilt version of the library in the commit. This should be able to be merged now.

@EchterAgo
Copy link
Contributor Author

Also, I replicated the Visual Studio TreeView style, you can see it in the options window.

@EchterAgo
Copy link
Contributor Author

Theme: Improve keyboard navigation and focus behaviour

Signed-off-by: Axel Gembe [email protected]

@EchterAgo
Copy link
Contributor Author

4ux-nbIx/AvalonDock.Themes.VS2013#8 has been merged now

@EchterAgo EchterAgo force-pushed the big_theme_update branch 2 times, most recently from 7fb074f to 967880b Compare September 13, 2016 06:31
@diluculo
Copy link
Contributor

diluculo commented Jul 12, 2018

@EchterAgo, I found this PO while finding a proper TreeView style on my project. Thanks for great work. I rebased and added ScrollViewer style. The result is big_theme_update_EchterAgo.

This commit generally improves the dark theme and also adds better control
styles to the Button, CheckBox, ColorPicker, ComboBox, ScrollBar, Slider,
TextBox and TreeView controls. In the theme implementation the resources
got moved from ApplicationResources to MainWindowResources so that the
settings window is not affected by the theme change.

Signed-off-by: Axel Gembe <[email protected]>
@EchterAgo
Copy link
Contributor Author

Rebased this on current master. Removed my rebuilt AvalonDock.Themes.VS2013.dll. Any issues that still prevent this from being merged?

@EchterAgo
Copy link
Contributor Author

I also added the changes by @diluculo

@tgjones tgjones merged commit 620210c into tgjones:master Nov 6, 2018
@tgjones
Copy link
Owner

tgjones commented Nov 6, 2018

Thanks, looks good! Nice to see you are still using Gemini 👍

@EchterAgo EchterAgo deleted the big_theme_update branch November 6, 2018 16:46
@EchterAgo
Copy link
Contributor Author

Thanks for merging :) Yes, I'm still using Gemini, its just that some other projects and some personal issues have taken most of my time lately. I have more things that I want to contribute soon.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants