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.

Sign up for GitHub

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

Jump to bottom

Qt: fix dockwidget background #4234

Merged
merged 1 commit into from
Mar 1, 2018
Merged

Qt: fix dockwidget background #4234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion bin/GuiConfigs/YoRHa by Ani.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ QWidget#cg_disasm {


/* Main Window, Dialogs and Trophy Manager which isn't a dialog */
QDialog, QWidget#trophy_manager, QMainWindow#main_window {
QDialog, QWidget#trophy_manager, QMainWindow#main_window {
border-image: url("GuiConfigs/YoRHa-background.jpg");
}

Expand Down Expand Up @@ -225,6 +225,9 @@ QDockWidget {
color: #b3ac98;
font-weight: 500;
}
[floating="true"] {
background: #b3ac98;
}
QDockWidget::title {
background: #4d4940;
padding-top: 0.2em;
Expand Down
6 changes: 3 additions & 3 deletions rpcs3/rpcs3qt/debugger_frame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ class debugger_frame : public QDockWidget

protected:
/** Override inherited method from Qt to allow signalling when close happened.*/
void closeEvent(QCloseEvent* event);
void showEvent(QShowEvent* event);
void hideEvent(QHideEvent* event);
void closeEvent(QCloseEvent* event) override;
void showEvent(QShowEvent* event) override;
void hideEvent(QHideEvent* event) override;

Q_SIGNALS:
void DebugFrameClosed();
Expand Down
15 changes: 15 additions & 0 deletions rpcs3/rpcs3qt/main_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,11 @@ void main_window::CreateDockWindows()
guiSettings->SetValue(gui::mw_logger, false);
}
});
connect(m_logFrame, &log_frame::topLevelChanged, [=](bool/* topLevel*/)
{
m_logFrame->style()->unpolish(m_logFrame);
m_logFrame->style()->polish(m_logFrame);
});

connect(m_debuggerFrame, &debugger_frame::DebugFrameClosed, [=]()
{
Expand All @@ -1337,6 +1342,11 @@ void main_window::CreateDockWindows()
guiSettings->SetValue(gui::mw_debugger, false);
}
});
connect(m_debuggerFrame, &log_frame::topLevelChanged, [=](bool/* topLevel*/)
{
m_debuggerFrame->style()->unpolish(m_debuggerFrame);
m_debuggerFrame->style()->polish(m_debuggerFrame);
});

connect(m_gameListFrame, &game_list_frame::GameListFrameClosed, [=]()
{
Expand All @@ -1346,6 +1356,11 @@ void main_window::CreateDockWindows()
guiSettings->SetValue(gui::mw_gamelist, false);
}
});
connect(m_gameListFrame, &log_frame::topLevelChanged, [=](bool/* topLevel*/)
{
m_gameListFrame->style()->unpolish(m_gameListFrame);
m_gameListFrame->style()->polish(m_gameListFrame);
});

connect(m_gameListFrame, &game_list_frame::RequestBoot, [this](const std::string& path){ Boot(path); });
}
Expand Down