summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/MainToolBar.cpp
diff options
context:
space:
mode:
authorLéo Lam <leolino.lam@gmail.com>2018-04-14 23:29:57 +0200
committerGitHub <noreply@github.com>2018-04-14 23:29:57 +0200
commit783e4ec2faa7e1fd0790b7d9f0ec5722540eca69 (patch)
tree350961b2b3839f13fed40bf5384c852d827243ec /Source/Core/DolphinWX/MainToolBar.cpp
parent371f807e67014ec26d836db45eb0fea7f026ec80 (diff)
parent0f8c51dfe49c98b7e77fe8a55c8fd3deafaab496 (diff)
Merge pull request #6633 from aldelaro5/wx-debugger-icons
Wx: debugger icons
Diffstat (limited to 'Source/Core/DolphinWX/MainToolBar.cpp')
-rw-r--r--Source/Core/DolphinWX/MainToolBar.cpp21
1 files changed, 6 insertions, 15 deletions
diff --git a/Source/Core/DolphinWX/MainToolBar.cpp b/Source/Core/DolphinWX/MainToolBar.cpp
index 9f34dcfb40..879ebeb5ec 100644
--- a/Source/Core/DolphinWX/MainToolBar.cpp
+++ b/Source/Core/DolphinWX/MainToolBar.cpp
@@ -98,13 +98,12 @@ void MainToolBar::InitializeThemeBitmaps()
void MainToolBar::InitializeDebuggerBitmaps()
{
- m_icon_bitmaps.insert(
- {{TOOLBAR_DEBUG_STEP, CreateDebuggerBitmap("toolbar_debugger_step")},
- {TOOLBAR_DEBUG_STEPOVER, CreateDebuggerBitmap("toolbar_debugger_step_over")},
- {TOOLBAR_DEBUG_STEPOUT, CreateDebuggerBitmap("toolbar_debugger_step_out")},
- {TOOLBAR_DEBUG_SKIP, CreateDebuggerBitmap("toolbar_debugger_skip")},
- {TOOLBAR_DEBUG_GOTOPC, CreateDebuggerBitmap("toolbar_debugger_goto_pc")},
- {TOOLBAR_DEBUG_SETPC, CreateDebuggerBitmap("toolbar_debugger_set_pc")}});
+ m_icon_bitmaps.insert({{TOOLBAR_DEBUG_STEP, CreateBitmap("debugger_step_in")},
+ {TOOLBAR_DEBUG_STEPOVER, CreateBitmap("debugger_step_over")},
+ {TOOLBAR_DEBUG_STEPOUT, CreateBitmap("debugger_step_out")},
+ {TOOLBAR_DEBUG_SKIP, CreateBitmap("debugger_skip")},
+ {TOOLBAR_DEBUG_GOTOPC, CreateBitmap("debugger_show_pc")},
+ {TOOLBAR_DEBUG_SETPC, CreateBitmap("debugger_set_pc")}});
}
wxBitmap MainToolBar::CreateBitmap(const std::string& name) const
@@ -112,14 +111,6 @@ wxBitmap MainToolBar::CreateBitmap(const std::string& name) const
return WxUtils::LoadScaledThemeBitmap(name, this, GetToolBitmapSize());
}
-wxBitmap MainToolBar::CreateDebuggerBitmap(const std::string& name) const
-{
- constexpr auto scale_flags = WxUtils::LSI_SCALE_DOWN | WxUtils::LSI_ALIGN_CENTER;
-
- return WxUtils::LoadScaledResourceBitmap(name, this, GetToolBitmapSize(), wxDefaultSize,
- scale_flags);
-}
-
void MainToolBar::ApplyThemeBitmaps()
{
constexpr std::array<std::pair<int, ToolBarBitmapID>, 8> bitmap_entries{