cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support frameless taskbarless dialogs in wxQt

Browse Source 
* Moved frameless hint to window, checking border
 * Removed duplicate code in wxFrame and asserts that were preventing AUI to work

Thanks to @seandepagnier for the original patch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mariano Reingart 2014-10-09 04:23:05 +00:00
parent 8c56462500
commit 5a6ec20ebc
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qt/frame.cpp
View File

@ -127,27 +127,11 @@ void wxFrame::SetWindowStyleFlag( long style )
Qt::WindowFlags qtFlags = GetHandle()->windowFlags();
wxCHECK_RET( !HasFlag( wxFRAME_FLOAT_ON_PARENT ) && !HasFlag( wxTINY_CAPTION ) ,
"wxFRAME_FLOAT_ON_PARENT, wxTINY_CAPTION not supported. Use wxFRAME_TOOL_WINDOW instead." );
wxCHECK_RET( !HasFlag( wxFRAME_TOOL_WINDOW ) || HasFlag( wxFRAME_NO_TASKBAR ) ,
"wxFRAME_TOOL_WINDOW without wxFRAME_NO_TASKBAR not supported." );
if ( HasFlag( wxFRAME_TOOL_WINDOW ) )
{
qtFlags &= ~Qt::WindowType_Mask;
qtFlags |= Qt::Tool;
}
else if ( HasFlag( wxFRAME_NO_TASKBAR ) )
{
qtFlags &= ~Qt::WindowType_Mask;
qtFlags |= Qt::Dialog;
}
if ( ( (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER) )
!= qtFlags.testFlag( Qt::FramelessWindowHint ) )
{
qtFlags ^= Qt::FramelessWindowHint;
}
GetHandle()->setWindowFlags( qtFlags );
}

20
src/qt/window.cpp
View File

@ -719,6 +719,26 @@ void wxWindowQt::SetWindowStyleFlag( long style )
// qtFrame->setFrameStyle( QFrame::StyledPanel );
// qtFrame->setFrameShadow( QFrame::Plain );
// }
Qt::WindowFlags qtFlags = GetHandle()->windowFlags();
if ( HasFlag( wxFRAME_NO_TASKBAR ) )
{
// qtFlags &= ~Qt::WindowType_Mask;
if ( (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER) ) {
qtFlags = Qt::ToolTip | Qt::FramelessWindowHint;
}
else
qtFlags |= Qt::Dialog;
}
else
if ( ( (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER) )
!= qtFlags.testFlag( Qt::FramelessWindowHint ) )
{
qtFlags ^= Qt::FramelessWindowHint;
}
GetHandle()->setWindowFlags( qtFlags );
}
void wxWindowQt::SetExtraStyle( long exStyle )