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

Fixed toolbar's disabled button color. #817

Merged
merged 2 commits into from Aug 23, 2014
Merged

Fixed toolbar's disabled button color. #817

merged 2 commits into from Aug 23, 2014

Conversation

archshift
Copy link
Contributor

Before, it would simply desaturate the buttons when they were disabled (which was an issue with the black-and-white buttons). Now it simply lightens it like it should.

A workaround had to be used that explicitly sets the buttons' disabled bitmaps to a lightened version. This happens automagically, though, so there's no need to bundle disabled icons with the themes.

This has been tested on Linux, Windows, and OS X.

toolBar->AddTool(IDM_STEPOVER, _("Step Over"), m_Bitmaps[Toolbar_StepOver]);
toolBar->AddTool(IDM_SKIP, _("Skip"), m_Bitmaps[Toolbar_Skip]);
WxUtils::AddToolbarButton(toolBar, IDM_STEP, _("Step"), m_Bitmaps[Toolbar_Step], "Step into the next instruction");
WxUtils::AddToolbarButton(toolBar, IDM_STEPOVER, _("Step Over"), m_Bitmaps[Toolbar_StepOver], "Step over the next instruction");

This comment was marked as off-topic.

@MayImilae
Copy link
Contributor

Screenshots please.

@archshift
Copy link
Contributor Author

Here's an imgur album.

@@ -75,6 +76,19 @@ wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length)
return(wxBitmap(wxImage(is, wxBITMAP_TYPE_ANY, -1), -1));
}

wxBitmap CreateDisabledButtonBitmap(wxBitmap original)

This comment was marked as off-topic.

@archshift
Copy link
Contributor Author

Rebased.

@MayImilae
Copy link
Contributor

Tested it. LGTM, at least on windows. Though I still don't understand why the text is not antialiased...

lioncash added a commit that referenced this pull request Aug 23, 2014
Fixed toolbar's disabled button color.
@lioncash lioncash merged commit 6a74f5e into dolphin-emu:master Aug 23, 2014
@archshift archshift deleted the disabledcolor branch August 23, 2014 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants