Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
8f1e01fc
Kaydet (Commit)
8f1e01fc
authored
Eyl 18, 2017
tarafından
Maxim Monastirsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Support non-ToolBox popup case in DockingManager, tdf#106762 prep
Change-Id: I54d4de28336b70dbd07923377e6cceb67079fa80
üst
ad769c30
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
5 deletions
+31
-5
dockwin.hxx
include/vcl/dockwin.hxx
+3
-0
dockmgr.cxx
vcl/source/window/dockmgr.cxx
+28
-5
No files found.
include/vcl/dockwin.hxx
Dosyayı görüntüle @
8f1e01fc
...
...
@@ -111,6 +111,7 @@ private:
DECL_LINK
(
PopupModeEnd
,
FloatingWindow
*
,
void
);
void
ImplEnableStartDocking
()
{
mbStartDockingEnabled
=
true
;
}
bool
ImplStartDockingEnabled
()
{
return
mbStartDockingEnabled
;
}
void
ImplPreparePopupMode
(
FloatWinPopupFlags
nFlags
);
public
:
ImplDockingWindowWrapper
(
const
vcl
::
Window
*
pWindow
);
...
...
@@ -133,6 +134,7 @@ public:
void
Unlock
();
bool
IsLocked
()
const
{
return
mbLocked
;}
void
StartPopupMode
(
const
tools
::
Rectangle
&
rRect
,
FloatWinPopupFlags
nPopupModeFlags
);
void
StartPopupMode
(
ToolBox
*
pParentToolBox
,
FloatWinPopupFlags
nPopupModeFlags
);
bool
IsInPopupMode
()
const
;
...
...
@@ -187,6 +189,7 @@ public:
void
Unlock
(
const
vcl
::
Window
*
pWin
);
bool
IsLocked
(
const
vcl
::
Window
*
pWin
);
void
StartPopupMode
(
const
vcl
::
Window
*
pWin
,
const
tools
::
Rectangle
&
rRect
,
FloatWinPopupFlags
nPopupModeFlags
);
void
StartPopupMode
(
ToolBox
*
pParentToolBox
,
const
vcl
::
Window
*
pWin
);
void
StartPopupMode
(
ToolBox
*
pParentToolBox
,
const
vcl
::
Window
*
pWin
,
FloatWinPopupFlags
nPopupModeFlags
);
...
...
vcl/source/window/dockmgr.cxx
Dosyayı görüntüle @
8f1e01fc
...
...
@@ -332,6 +332,13 @@ void DockingManager::SetFloatingMode( const vcl::Window *pWindow, bool bFloating
pWrapper
->
SetFloatingMode
(
bFloating
);
}
void
DockingManager
::
StartPopupMode
(
const
vcl
::
Window
*
pWindow
,
const
tools
::
Rectangle
&
rRect
,
FloatWinPopupFlags
nFlags
)
{
ImplDockingWindowWrapper
*
pWrapper
=
GetDockingWindowWrapper
(
pWindow
);
if
(
pWrapper
)
pWrapper
->
StartPopupMode
(
rRect
,
nFlags
);
}
void
DockingManager
::
StartPopupMode
(
ToolBox
*
pParentToolBox
,
const
vcl
::
Window
*
pWindow
,
FloatWinPopupFlags
nFlags
)
{
ImplDockingWindowWrapper
*
pWrapper
=
GetDockingWindowWrapper
(
pWindow
);
...
...
@@ -915,12 +922,8 @@ void ImplDockingWindowWrapper::ShowTitleButton( TitleButton nButton, bool bVisib
}
}
void
ImplDockingWindowWrapper
::
StartPopupMode
(
ToolBox
*
pParentToolBox
,
FloatWinPopupFlags
nFlags
)
void
ImplDockingWindowWrapper
::
ImplPreparePopupMode
(
FloatWinPopupFlags
nFlags
)
{
// do nothing if window is floating
if
(
IsFloatingMode
()
)
return
;
GetWindow
()
->
Show
(
false
,
ShowFlags
::
NoFocusChange
);
// prepare reparenting
...
...
@@ -966,6 +969,15 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
// set mpFloatWin not until all window positioning is done !!!
// (SetPosPixel etc. check for valid mpFloatWin pointer)
mpFloatWin
=
pWin
;
}
void
ImplDockingWindowWrapper
::
StartPopupMode
(
ToolBox
*
pParentToolBox
,
FloatWinPopupFlags
nFlags
)
{
// do nothing if window is floating
if
(
IsFloatingMode
()
)
return
;
ImplPreparePopupMode
(
nFlags
);
// if the subtoolbar was opened via keyboard make sure that key events
// will go into subtoolbar
...
...
@@ -983,6 +995,17 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
}
}
void
ImplDockingWindowWrapper
::
StartPopupMode
(
const
tools
::
Rectangle
&
rRect
,
FloatWinPopupFlags
nFlags
)
{
// do nothing if window is floating
if
(
IsFloatingMode
()
)
return
;
ImplPreparePopupMode
(
nFlags
);
mpFloatWin
->
StartPopupMode
(
rRect
,
nFlags
);
GetWindow
()
->
Show
();
}
IMPL_LINK_NOARG
(
ImplDockingWindowWrapper
,
PopupModeEnd
,
FloatingWindow
*
,
void
)
{
GetWindow
()
->
Show
(
false
,
ShowFlags
::
NoFocusChange
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment