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
e48d1086
Kaydet (Commit)
e48d1086
authored
Eki 09, 2016
tarafından
Maxim Monastirsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
The key event is not needed for the non-ToolBox case
Change-Id: I8d593665f1c2bcafa583eca311cd86ab618dec3d
üst
8e8afc35
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
dockmgr.cxx
vcl/source/window/dockmgr.cxx
+5
-3
No files found.
vcl/source/window/dockmgr.cxx
Dosyayı görüntüle @
e48d1086
...
@@ -1043,10 +1043,12 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
...
@@ -1043,10 +1043,12 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
if
(
mpOldBorderWin
.
get
()
==
GetWindow
()
)
if
(
mpOldBorderWin
.
get
()
==
GetWindow
()
)
mpOldBorderWin
=
nullptr
;
// no border window found
mpOldBorderWin
=
nullptr
;
// no border window found
bool
bAllowTearOff
=
bool
(
nFlags
&
FloatWinPopupFlags
::
AllowTearOff
);
bool
bIsToolBox
=
GetWindow
()
->
GetType
()
==
WINDOW_TOOLBOX
;
// the new parent for popup mode
// the new parent for popup mode
VclPtr
<
FloatingWindow
>
pWin
;
VclPtr
<
FloatingWindow
>
pWin
;
bool
bAllowTearOff
=
bool
(
nFlags
&
FloatWinPopupFlags
::
AllowTearOff
);
if
(
bAllowTearOff
&&
!
bIsToolBox
)
if
(
bAllowTearOff
&&
!
dynamic_cast
<
ToolBox
*
>
(
GetWindow
()
)
)
pWin
=
VclPtr
<
FloatingWindow
>::
Create
(
mpParent
,
WB_STDPOPUP
);
pWin
=
VclPtr
<
FloatingWindow
>::
Create
(
mpParent
,
WB_STDPOPUP
);
else
else
pWin
=
VclPtr
<
ImplPopupFloatWin
>::
Create
(
mpParent
,
this
,
bAllowTearOff
);
pWin
=
VclPtr
<
ImplPopupFloatWin
>::
Create
(
mpParent
,
this
,
bAllowTearOff
);
...
@@ -1087,7 +1089,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
...
@@ -1087,7 +1089,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
mpFloatWin
->
StartPopupMode
(
pParentToolBox
,
nFlags
);
mpFloatWin
->
StartPopupMode
(
pParentToolBox
,
nFlags
);
GetWindow
()
->
Show
();
GetWindow
()
->
Show
();
if
(
pParentToolBox
->
IsKeyEvent
()
)
if
(
bIsToolBox
&&
pParentToolBox
->
IsKeyEvent
()
)
{
{
// send HOME key to subtoolbar in order to select first item
// send HOME key to subtoolbar in order to select first item
KeyEvent
aEvent
(
0
,
vcl
::
KeyCode
(
KEY_HOME
)
);
KeyEvent
aEvent
(
0
,
vcl
::
KeyCode
(
KEY_HOME
)
);
...
...
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