The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-04 03:46:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to beautify About dialog on OS X.

Browse Source 
Added a 2x version of the logo, and cleaned up layout a bit.
This commit is contained in:
Jeffrey Pfau 2015-04-25 04:22:32 -07:00
parent 392b9abece
commit addbafcfda
4 changed files with 966 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Data/Sys/Resources/dolphin_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
Data/Sys/Resources/dolphin_logo@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

29
Source/Core/DolphinWX/AboutDolphin.cpp
View File

@ -26,10 +26,24 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
const wxSize& size, long style) const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style) : wxDialog(parent, id, title, position, size, style)
{ {
wxMemoryInputStream istream(dolphin_logo_png, sizeof dolphin_logo_png); const unsigned char* dolphin_logo_bin;
size_t dolphin_logo_size;
double scaleFactor = 1.0;
if (GetContentScaleFactor() >= 2)
{
dolphin_logo_bin = dolphin_logo_2x_png;
dolphin_logo_size = sizeof dolphin_logo_2x_png;
scaleFactor = 2.0;
}
else
{
dolphin_logo_bin = dolphin_logo_png;
dolphin_logo_size = sizeof dolphin_logo_png;
}
wxMemoryInputStream istream(dolphin_logo_bin, dolphin_logo_size);
wxImage iDolphinLogo(istream, wxBITMAP_TYPE_PNG); wxImage iDolphinLogo(istream, wxBITMAP_TYPE_PNG);
wxGenericStaticBitmap* const sbDolphinLogo = new wxGenericStaticBitmap(this, wxID_ANY, wxGenericStaticBitmap* const sbDolphinLogo = new wxGenericStaticBitmap(this, wxID_ANY,
wxBitmap(iDolphinLogo)); wxBitmap(iDolphinLogo, -1, scaleFactor));
const wxString DolphinText = _("Dolphin"); const wxString DolphinText = _("Dolphin");
const wxString RevisionText = scm_desc_str; const wxString RevisionText = scm_desc_str;
@ -47,7 +61,7 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
const wxString SupportText = _("Support"); const wxString SupportText = _("Support");
wxStaticText* const Dolphin = new wxStaticText(this, wxID_ANY, DolphinText); wxStaticText* const Dolphin = new wxStaticText(this, wxID_ANY, DolphinText);
wxTextCtrl* const Revision = new wxTextCtrl(this, wxID_ANY, RevisionText, wxDefaultPosition, wxDefaultSize); wxTextCtrl* const Revision = new wxTextCtrl(this, wxID_ANY, RevisionText, wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText); wxStaticText* const Copyright = new wxStaticText(this, wxID_ANY, CopyrightText);
wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxTE_MULTILINE | wxNO_BORDER | wxTE_NO_VSCROLL); wxTextCtrl* const Branch = new wxTextCtrl(this, wxID_ANY, "", wxDefaultPosition, wxSize(300, 50), wxTE_MULTILINE | wxNO_BORDER | wxTE_NO_VSCROLL);
wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text); wxStaticText* const Message = new wxStaticText(this, wxID_ANY, Text);
@ -106,8 +120,15 @@ AboutDolphin::AboutDolphin(wxWindow *parent, wxWindowID id,
sInfo->Add(Message); sInfo->Add(Message);
sInfo->Add(sLinks); sInfo->Add(sLinks);
wxBoxSizer* const sLogo = new wxBoxSizer(wxVERTICAL);
sLogo->AddSpacer(75);
sLogo->Add(sbDolphinLogo);
sLogo->AddSpacer(40);
wxBoxSizer* const sMainHor = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const sMainHor = new wxBoxSizer(wxHORIZONTAL);
sMainHor->Add(sbDolphinLogo); sMainHor->AddSpacer(30);
sMainHor->Add(sLogo);
sMainHor->AddSpacer(30);
sMainHor->Add(sInfo); sMainHor->Add(sInfo);
sMainHor->AddSpacer(30); sMainHor->AddSpacer(30);

1625
Source/Core/DolphinWX/resources/dolphin_logo.cpp
View File

File diff suppressed because it is too large Load Diff