Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/clientdlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,24 @@ void CClientDlg::ShowGeneralSettings ( int iTab )
ClientSettingsDlg.activateWindow();
}

#if defined( Q_OS_IOS )
void CClientDlg::RaiseRestoredWindows()
Comment thread
ann0see marked this conversation as resolved.
Resolved
{
// the dialogs restored from the settings are shown in the constructor, i.e. before
// this window, so the main window is in front of them. Bring them forward again.
if ( ClientSettingsDlg.isVisible() )
{
ClientSettingsDlg.raise();
ClientSettingsDlg.activateWindow();
}

if ( ChatDlg.isVisible() )
{
ChatDlg.raise();
}
}
#endif

void CClientDlg::ShowChatWindow ( const bool bForceRaise )
{
ChatDlg.show();
Expand Down
4 changes: 4 additions & 0 deletions src/clientdlg.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ class CClientDlg : public CBaseDlg, private Ui_CClientDlgBase
const bool bMuteStream,
QWidget* parent = nullptr );

#if defined( Q_OS_IOS )
void RaiseRestoredWindows();
Comment thread
ann0see marked this conversation as resolved.
Resolved
#endif

protected:
void SetGUIDesign ( const EGUIDesign eNewDesign );
void SetMeterStyle ( const EMeterStyle eNewMeterStyle );
Expand Down
5 changes: 5 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,11 @@ int main ( int argc, char** argv )

// show dialog
ClientDlg.show();
# if defined( Q_OS_IOS )
// iOS has no window manager, so the main window is presented in front of
// the windows restored from the settings. Bring them forward again.
ClientDlg.RaiseRestoredWindows();
# endif

// Connect on startup if requested
if ( !strConnOnStartupAddress.isEmpty() )
Expand Down
Loading