|
 |
f325b2 |
From b9431532ba696a39e7d35597f4083ea356b63eb3 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f325b2 |
Date: Wed, 16 Dec 2015 21:30:22 +0000
|
|
|
f325b2 |
Subject: [PATCH] remove newly unused WB_NEEDSFOCUS and fragile FLOAT_FOCUSABLE
|
|
|
f325b2 |
MIME-Version: 1.0
|
|
|
f325b2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
f325b2 |
Content-Transfer-Encoding: 8bit
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Idce03318fbc01039a6c0638879785607970993c0
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/20746
|
|
|
f325b2 |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f325b2 |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f325b2 |
---
|
|
|
f325b2 |
include/tools/wintypes.hxx | 1 -
|
|
|
f325b2 |
vcl/inc/salframe.hxx | 2 -
|
|
|
f325b2 |
vcl/inc/unx/gtk/gtkframe.hxx | 3 +-
|
|
|
f325b2 |
vcl/osx/salframeview.mm | 1807 -----------------------------------------
|
|
|
f325b2 |
vcl/source/window/brdwin.cxx | 2 +-
|
|
|
f325b2 |
vcl/source/window/window.cxx | 4 +-
|
|
|
f325b2 |
vcl/unx/gtk/gtksalframe.cxx | 11 +-
|
|
|
f325b2 |
vcl/unx/gtk3/gtk3gtkframe.cxx | 9 +-
|
|
|
f325b2 |
8 files changed, 8 insertions(+), 1831 deletions(-)
|
|
|
f325b2 |
delete mode 100644 vcl/osx/salframeview.mm
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
|
|
|
f325b2 |
index 897e635..3943cc4 100644
|
|
|
f325b2 |
--- a/include/tools/wintypes.hxx
|
|
|
f325b2 |
+++ b/include/tools/wintypes.hxx
|
|
|
f325b2 |
@@ -180,7 +180,6 @@ WinBits const WB_NOSHADOW = SAL_CONST_INT64(0x400000000);
|
|
|
f325b2 |
WinBits const WB_TOOLTIPWIN = SAL_CONST_INT64(0x800000000);
|
|
|
f325b2 |
WinBits const WB_OWNERDRAWDECORATION = SAL_CONST_INT64(0x2000000000);
|
|
|
f325b2 |
WinBits const WB_DEFAULTWIN = SAL_CONST_INT64(0x4000000000);
|
|
|
f325b2 |
-WinBits const WB_NEEDSFOCUS = SAL_CONST_INT64(0x1000000000);
|
|
|
f325b2 |
WinBits const WB_POPUP = SAL_CONST_INT64(0x20000000);
|
|
|
f325b2 |
|
|
|
f325b2 |
WinBits const WB_HSCROLL = WB_HORZ;
|
|
|
f325b2 |
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
|
|
|
f325b2 |
index 9b3d52e..1016d3c 100644
|
|
|
f325b2 |
--- a/vcl/inc/salframe.hxx
|
|
|
f325b2 |
+++ b/vcl/inc/salframe.hxx
|
|
|
f325b2 |
@@ -76,8 +76,6 @@ struct SystemEnvData;
|
|
|
f325b2 |
#define SAL_FRAME_STYLE_SYSTEMCHILD ((sal_uLong)0x08000000)
|
|
|
f325b2 |
// floating window
|
|
|
f325b2 |
#define SAL_FRAME_STYLE_FLOAT ((sal_uLong)0x20000000)
|
|
|
f325b2 |
-// floating window that needs to be focusable
|
|
|
f325b2 |
-#define SAL_FRAME_STYLE_FLOAT_FOCUSABLE ((sal_uLong)0x04000000)
|
|
|
f325b2 |
// toolwindows should be painted with a smaller decoration
|
|
|
f325b2 |
#define SAL_FRAME_STYLE_TOOLWINDOW ((sal_uLong)0x40000000)
|
|
|
f325b2 |
// the window containing the intro bitmap, aka splashscreen
|
|
|
f325b2 |
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
|
|
|
f325b2 |
index a55ff2c..479a41b 100644
|
|
|
f325b2 |
--- a/vcl/inc/unx/gtk/gtkframe.hxx
|
|
|
f325b2 |
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
|
|
|
f325b2 |
@@ -292,8 +292,7 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider
|
|
|
f325b2 |
return
|
|
|
f325b2 |
(m_nStyle & SAL_FRAME_STYLE_FLOAT) && // only a float can be floatgrab
|
|
|
f325b2 |
!(m_nStyle & SAL_FRAME_STYLE_TOOLTIP) && // tool tips are not
|
|
|
f325b2 |
- !(m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && // toolbars are also not
|
|
|
f325b2 |
- !(m_nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE); // focusable floats are not
|
|
|
f325b2 |
+ !(m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION); // toolbars are also not
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
bool isChild( bool bPlug = true, bool bSysChild = true )
|
|
|
f325b2 |
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
|
|
|
f325b2 |
index f57ab37..0e354bd 100644
|
|
|
f325b2 |
--- a/vcl/source/window/brdwin.cxx
|
|
|
f325b2 |
+++ b/vcl/source/window/brdwin.cxx
|
|
|
f325b2 |
@@ -1750,7 +1750,7 @@ void ImplBorderWindow::ImplInit( vcl::Window* pParent,
|
|
|
f325b2 |
{
|
|
|
f325b2 |
// remove all unwanted WindowBits
|
|
|
f325b2 |
WinBits nOrgStyle = nStyle;
|
|
|
f325b2 |
- WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_PINABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_NEEDSFOCUS | WB_POPUP);
|
|
|
f325b2 |
+ WinBits nTestStyle = (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_PINABLE | WB_CLOSEABLE | WB_STANDALONE | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_SYSTEMFLOATWIN | WB_INTROWIN | WB_DEFAULTWIN | WB_TOOLTIPWIN | WB_NOSHADOW | WB_OWNERDRAWDECORATION | WB_SYSTEMCHILDWINDOW | WB_POPUP);
|
|
|
f325b2 |
if ( nTypeStyle & BORDERWINDOW_STYLE_APP )
|
|
|
f325b2 |
nTestStyle |= WB_APP;
|
|
|
f325b2 |
nStyle &= nTestStyle;
|
|
|
f325b2 |
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
|
|
|
f325b2 |
index 808d683..87b8e93 100644
|
|
|
f325b2 |
--- a/vcl/source/window/window.cxx
|
|
|
f325b2 |
+++ b/vcl/source/window/window.cxx
|
|
|
f325b2 |
@@ -911,7 +911,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
|
|
|
f325b2 |
nBorderTypeStyle |= BORDERWINDOW_STYLE_FRAME;
|
|
|
f325b2 |
nStyle |= WB_BORDER;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
- VclPtrInstance<ImplBorderWindow> pBorderWin( pParent, nStyle & (WB_BORDER | WB_DIALOGCONTROL | WB_NODIALOGCONTROL | WB_NEEDSFOCUS), nBorderTypeStyle );
|
|
|
f325b2 |
+ VclPtrInstance<ImplBorderWindow> pBorderWin( pParent, nStyle & (WB_BORDER | WB_DIALOGCONTROL | WB_NODIALOGCONTROL), nBorderTypeStyle );
|
|
|
f325b2 |
((vcl::Window*)pBorderWin)->mpWindowImpl->mpClientWindow = this;
|
|
|
f325b2 |
pBorderWin->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder );
|
|
|
f325b2 |
mpWindowImpl->mpBorderWindow = pBorderWin;
|
|
|
f325b2 |
@@ -966,8 +966,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
|
|
|
f325b2 |
nFrameStyle = SAL_FRAME_STYLE_FLOAT;
|
|
|
f325b2 |
if( nStyle & WB_OWNERDRAWDECORATION )
|
|
|
f325b2 |
nFrameStyle |= (SAL_FRAME_STYLE_OWNERDRAWDECORATION | SAL_FRAME_STYLE_NOSHADOW);
|
|
|
f325b2 |
- if( nStyle & WB_NEEDSFOCUS )
|
|
|
f325b2 |
- nFrameStyle |= SAL_FRAME_STYLE_FLOAT_FOCUSABLE;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
else if( mpWindowImpl->mbFloatWin )
|
|
|
f325b2 |
nFrameStyle |= SAL_FRAME_STYLE_TOOLWINDOW;
|
|
|
f325b2 |
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
|
|
|
f325b2 |
index 03f25dd..bd9662c 100644
|
|
|
f325b2 |
--- a/vcl/unx/gtk/gtksalframe.cxx
|
|
|
f325b2 |
+++ b/vcl/unx/gtk/gtksalframe.cxx
|
|
|
f325b2 |
@@ -1373,8 +1373,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
|
|
|
f325b2 |
m_nStyle = nStyle;
|
|
|
f325b2 |
|
|
|
f325b2 |
GtkWindowType eWinType = ( (nStyle & SAL_FRAME_STYLE_FLOAT) &&
|
|
|
f325b2 |
- ! (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|
|
|
|
f325b2 |
- SAL_FRAME_STYLE_FLOAT_FOCUSABLE))
|
|
|
f325b2 |
+ ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)
|
|
|
f325b2 |
)
|
|
|
f325b2 |
? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -1419,7 +1418,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
|
|
|
f325b2 |
bool bDecoHandling =
|
|
|
f325b2 |
! isChild() &&
|
|
|
f325b2 |
( ! (nStyle & SAL_FRAME_STYLE_FLOAT) ||
|
|
|
f325b2 |
- (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|SAL_FRAME_STYLE_FLOAT_FOCUSABLE) ) );
|
|
|
f325b2 |
+ (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION ) );
|
|
|
f325b2 |
|
|
|
f325b2 |
if( bDecoHandling )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
@@ -1441,10 +1440,6 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
|
|
|
f325b2 |
eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
|
|
|
f325b2 |
lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, true );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
- else if( (nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) )
|
|
|
f325b2 |
- {
|
|
|
f325b2 |
- eType = GDK_WINDOW_TYPE_HINT_UTILITY;
|
|
|
f325b2 |
- }
|
|
|
f325b2 |
#if !GTK_CHECK_VERSION(3,0,0)
|
|
|
f325b2 |
if( (nStyle & SAL_FRAME_STYLE_PARTIAL_FULLSCREEN )
|
|
|
f325b2 |
&& getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
|
|
|
f325b2 |
@@ -2770,7 +2765,7 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags )
|
|
|
f325b2 |
* to our window - which it of course won't since our input hint
|
|
|
f325b2 |
* is set to false.
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
- if( (m_nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|SAL_FRAME_STYLE_FLOAT_FOCUSABLE)) )
|
|
|
f325b2 |
+ if (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
// sad but true: this can cause an XError, we need to catch that
|
|
|
f325b2 |
// to do this we need to synchronize with the XServer
|
|
|
f325b2 |
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
f325b2 |
index d41be9d..4ac3da7 100644
|
|
|
f325b2 |
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
f325b2 |
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
f325b2 |
@@ -1121,8 +1121,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
|
|
|
f325b2 |
m_nStyle = nStyle;
|
|
|
f325b2 |
|
|
|
f325b2 |
GtkWindowType eWinType = ( (nStyle & SAL_FRAME_STYLE_FLOAT) &&
|
|
|
f325b2 |
- ! (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|
|
|
|
f325b2 |
- SAL_FRAME_STYLE_FLOAT_FOCUSABLE))
|
|
|
f325b2 |
+ ! (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION)
|
|
|
f325b2 |
)
|
|
|
f325b2 |
? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL;
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -1167,7 +1166,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
|
|
|
f325b2 |
bool bDecoHandling =
|
|
|
f325b2 |
! isChild() &&
|
|
|
f325b2 |
( ! (nStyle & SAL_FRAME_STYLE_FLOAT) ||
|
|
|
f325b2 |
- (nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|SAL_FRAME_STYLE_FLOAT_FOCUSABLE) ) );
|
|
|
f325b2 |
+ (nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION ) );
|
|
|
f325b2 |
|
|
|
f325b2 |
if( bDecoHandling )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
@@ -1190,10 +1189,6 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
|
|
|
f325b2 |
gtk_window_set_accept_focus(GTK_WINDOW(m_pWindow), false);
|
|
|
f325b2 |
gtk_window_set_decorated(GTK_WINDOW(m_pWindow), false);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
- else if( (nStyle & SAL_FRAME_STYLE_FLOAT_FOCUSABLE) )
|
|
|
f325b2 |
- {
|
|
|
f325b2 |
- eType = GDK_WINDOW_TYPE_HINT_UTILITY;
|
|
|
f325b2 |
- }
|
|
|
f325b2 |
gtk_window_set_type_hint( GTK_WINDOW(m_pWindow), eType );
|
|
|
f325b2 |
gtk_window_set_gravity( GTK_WINDOW(m_pWindow), GDK_GRAVITY_STATIC );
|
|
|
f325b2 |
}
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.5.0
|
|
|
f325b2 |
|