ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4207 from aldelaro5/debugger-floating-window-fix 

Debugger: Fix some floating window issues
This commit is contained in:
Scott Mansell 2016-09-14 18:08:23 +12:00 committed by GitHub
parent ab37b0282a 6029c946f5
commit d5c25a8990
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/FrameAui.cpp
View File

@ -297,9 +297,11 @@ void CFrame::DoFloatNotebookPage(wxWindowID Id)
wxAuiNotebook* nb = GetNotebookFromId(i); wxAuiNotebook* nb = GetNotebookFromId(i);
if (nb->GetPageIndex(Win) != wxNOT_FOUND) if (nb->GetPageIndex(Win) != wxNOT_FOUND)
{ {
nb->RemovePage(nb->GetPageIndex(Win)); // Set the selected tab manually so the window is drawn before reparenting the window
nb->SetSelection(nb->GetPageIndex(Win));
// Create the parent frame and reparent the window // Create the parent frame and reparent the window
CreateParentFrame(Win->GetId() + IDM_LOG_WINDOW_PARENT - IDM_LOG_WINDOW, Win->GetName(), Win); CreateParentFrame(Win->GetId() + IDM_LOG_WINDOW_PARENT - IDM_LOG_WINDOW, Win->GetName(), Win);
nb->RemovePage(nb->GetPageIndex(Win));
if (nb->GetPageCount() == 0) if (nb->GetPageCount() == 0)
AddRemoveBlankPage(); AddRemoveBlankPage();
} }

2
Source/Core/DolphinWX/Globals.h
View File

@ -188,6 +188,7 @@ enum
IDM_LOG_WINDOW_PARENT, IDM_LOG_WINDOW_PARENT,
IDM_LOG_CONFIG_WINDOW_PARENT, IDM_LOG_CONFIG_WINDOW_PARENT,
IDM_REGISTER_WINDOW_PARENT, IDM_REGISTER_WINDOW_PARENT,
IDM_WATCH_WINDOW_PARENT,
IDM_BREAKPOINT_WINDOW_PARENT, IDM_BREAKPOINT_WINDOW_PARENT,
IDM_MEMORY_WINDOW_PARENT, IDM_MEMORY_WINDOW_PARENT,
IDM_JIT_WINDOW_PARENT, IDM_JIT_WINDOW_PARENT,
@ -199,6 +200,7 @@ enum
IDM_FLOAT_LOG_WINDOW, IDM_FLOAT_LOG_WINDOW,
IDM_FLOAT_LOG_CONFIG_WINDOW, IDM_FLOAT_LOG_CONFIG_WINDOW,
IDM_FLOAT_REGISTER_WINDOW, IDM_FLOAT_REGISTER_WINDOW,
IDM_FLOAT_WATCH_WINDOW,
IDM_FLOAT_BREAKPOINT_WINDOW, IDM_FLOAT_BREAKPOINT_WINDOW,
IDM_FLOAT_MEMORY_WINDOW, IDM_FLOAT_MEMORY_WINDOW,
IDM_FLOAT_JIT_WINDOW, IDM_FLOAT_JIT_WINDOW,