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
2ebd9da7
Kaydet (Commit)
2ebd9da7
authored
May 23, 2018
tarafından
Katarina Behrens
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Native leaf menus and submenus are now visible
Change-Id: Ieaac0966b167d82c8bdeb60f3ce4b9cc8589ec62
üst
8d783183
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
24 deletions
+32
-24
Qt5Menu.hxx
vcl/inc/qt5/Qt5Menu.hxx
+2
-4
Qt5Menu.cxx
vcl/qt5/Qt5Menu.cxx
+30
-20
No files found.
vcl/inc/qt5/Qt5Menu.hxx
Dosyayı görüntüle @
2ebd9da7
...
...
@@ -12,6 +12,7 @@
#include <salmenu.hxx>
class
MenuItemList
;
class
QMenu
;
class
QMenuBar
;
class
Qt5MenuItem
;
class
Qt5Frame
;
...
...
@@ -24,12 +25,9 @@ private:
Qt5Menu
*
mpParentSalMenu
;
Qt5Frame
*
mpFrame
;
bool
mbMenuBar
;
QMenuBar
*
mpQMenuBar
;
void
ActivateAllSubMenus
(
Menu
*
pMenuBar
);
void
Update
();
void
DoFullMenuUpdate
(
Menu
*
pMenuBar
,
QMenu
*
pParentMenu
=
nullptr
);
void
NativeItemText
(
OUString
&
rItemText
);
public
:
...
...
vcl/qt5/Qt5Menu.cxx
Dosyayı görüntüle @
2ebd9da7
...
...
@@ -53,6 +53,16 @@ void Qt5Menu::RemoveItem( unsigned nPos )
void
Qt5Menu
::
SetSubMenu
(
SalMenuItem
*
pSalMenuItem
,
SalMenu
*
pSubMenu
,
unsigned
nPos
)
{
SolarMutexGuard
aGuard
;
Qt5MenuItem
*
pItem
=
static_cast
<
Qt5MenuItem
*
>
(
pSalMenuItem
);
Qt5Menu
*
pQSubMenu
=
static_cast
<
Qt5Menu
*
>
(
pSubMenu
);
if
(
pQSubMenu
==
nullptr
)
return
;
pQSubMenu
->
mpParentSalMenu
=
this
;
pItem
->
mpSubMenu
=
pQSubMenu
;
}
void
Qt5Menu
::
SetFrame
(
const
SalFrame
*
pFrame
)
...
...
@@ -68,26 +78,10 @@ void Qt5Menu::SetFrame( const SalFrame* pFrame )
if
(
pMainWindow
)
mpQMenuBar
=
pMainWindow
->
menuBar
();
ActivateAllSubMenus
(
mpVCLMenu
);
Update
();
DoFullMenuUpdate
(
mpVCLMenu
);
}
void
Qt5Menu
::
ActivateAllSubMenus
(
Menu
*
pMenuBar
)
{
for
(
Qt5MenuItem
*
pSalItem
:
maItems
)
{
if
(
pSalItem
->
mpSubMenu
!=
nullptr
)
{
pMenuBar
->
HandleMenuActivateEvent
(
pSalItem
->
mpSubMenu
->
GetMenu
());
pSalItem
->
mpSubMenu
->
ActivateAllSubMenus
(
pMenuBar
);
pSalItem
->
mpSubMenu
->
Update
();
pMenuBar
->
HandleMenuDeActivateEvent
(
pSalItem
->
mpSubMenu
->
GetMenu
());
}
}
}
void
Qt5Menu
::
Update
()
void
Qt5Menu
::
DoFullMenuUpdate
(
Menu
*
pMenuBar
,
QMenu
*
pParentMenu
)
{
Menu
*
pVCLMenu
=
mpVCLMenu
;
...
...
@@ -99,11 +93,27 @@ void Qt5Menu::Update()
Qt5MenuItem
*
pSalMenuItem
=
GetItemAtPos
(
nItem
);
sal_uInt16
nId
=
pSalMenuItem
->
mnId
;
OUString
aText
=
pVCLMenu
->
GetItemText
(
nId
);
QMenu
*
pQMenu
=
pParentMenu
;
NativeItemText
(
aText
);
if
(
mbMenuBar
&&
mpQMenuBar
)
// top-level menu
pQMenu
=
mpQMenuBar
->
addMenu
(
toQString
(
aText
)
);
else
{
if
(
pSalMenuItem
->
mpSubMenu
)
// submenu
pQMenu
=
pQMenu
->
addMenu
(
toQString
(
aText
)
);
else
// leaf menu
pQMenu
->
addAction
(
toQString
(
aText
)
);
}
if
(
pSalMenuItem
->
mpSubMenu
!=
nullptr
)
{
NativeItemText
(
aText
);
mpQMenuBar
->
addMenu
(
toQString
(
aText
)
);
pMenuBar
->
HandleMenuActivateEvent
(
pSalMenuItem
->
mpSubMenu
->
GetMenu
());
pSalMenuItem
->
mpSubMenu
->
DoFullMenuUpdate
(
pMenuBar
,
pQMenu
);
pMenuBar
->
HandleMenuDeActivateEvent
(
pSalMenuItem
->
mpSubMenu
->
GetMenu
());
}
}
}
...
...
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