diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-30 13:32:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-06-30 13:32:00 +0000 |
| commit | 6e65514b749dee2d145cc64f0e1caca2c7e9330a (patch) | |
| tree | 3cc3a02c78cbe76eb5cb580b41a5af8094af82cb /vcl | |
| parent | 8993e9ab33d9c8f139c8f7c76552f553781c4244 (diff) | |
INTEGRATION: CWS vcl13 (1.41.12); FILE MERGED
2003/06/20 14:19:07 pl 1.41.12.2: #110333# workaround Dtwm: windows without a title
2003/06/19 12:37:21 pl 1.41.12.1: #110326# do not grab focus for status window, prepare utility window hint for WM
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/app/wmadaptor.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx index e532fe3826d8..8b40829b2ee8 100644 --- a/vcl/unx/source/app/wmadaptor.cxx +++ b/vcl/unx/source/app/wmadaptor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wmadaptor.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.42 $ * - * last change: $Author: vg $ $Date: 2003-06-04 11:24:20 $ + * last change: $Author: hr $ $Date: 2003-06-30 14:32:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1369,6 +1369,10 @@ void WMAdaptor::setFrameTypeAndDecoration( SalFrame* pFrame, WMWindowType eType, if( ! pReferenceFrame->maFrameData.bMapped_ ) pFrame->maFrameData.mbTransientForRoot = true; } + // #110333# in case no one ever sets a title prevent + // the Dtwm taking the class instead + if( m_aWMName.EqualsAscii( "Dtwm" ) ) + setWMName( pFrame, String() ); } /* @@ -1391,6 +1395,14 @@ void NetWMAdaptor::setFrameTypeAndDecoration( SalFrame* pFrame, WMWindowType eTy WMAtom eWMType; switch( eType ) { + case windowType_Utility: +#if 0 + // advertise tool windows as dialogues not utilities for now + // due to a bug in metacity 2.4.34 (smaller titlebar font on + // resizable utility windows) + eWMType = m_aWMAtoms[ NET_WM_WINDOW_TYPE_UTILITY ] ? NET_WM_WINDOW_TYPE_UTILITY : NET_WM_WINDOW_TYPE_DIALOG; + break; +#endif case windowType_ModelessDialogue: case windowType_ModalDialogue: eWMType = NET_WM_WINDOW_TYPE_DIALOG; |