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
c6fc963c
Kaydet (Commit)
c6fc963c
authored
Eyl 22, 2016
tarafından
Jan-Marek Glogowski
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
KDE4 enable and handle rollover menubar
Change-Id: Ice2657c8e8ecccb67d1b14292514a42ff37caa39
üst
843b9d5d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
KDEData.cxx
vcl/unx/kde4/KDEData.cxx
+2
-0
KDESalFrame.cxx
vcl/unx/kde4/KDESalFrame.cxx
+9
-10
No files found.
vcl/unx/kde4/KDEData.cxx
Dosyayı görüntüle @
c6fc963c
...
@@ -46,6 +46,8 @@ void KDEData::initNWF()
...
@@ -46,6 +46,8 @@ void KDEData::initNWF()
pSVData
->
maNWFData
.
mbDockingAreaSeparateTB
=
true
;
pSVData
->
maNWFData
.
mbDockingAreaSeparateTB
=
true
;
// no borders for menu, theming does that
// no borders for menu, theming does that
pSVData
->
maNWFData
.
mbFlatMenu
=
true
;
pSVData
->
maNWFData
.
mbFlatMenu
=
true
;
// Qt theme engines may support a rollover menubar
pSVData
->
maNWFData
.
mbRolloverMenubar
=
true
;
// Styled menus need additional space
// Styled menus need additional space
QStyle
*
style
=
QApplication
::
style
();
QStyle
*
style
=
QApplication
::
style
();
...
...
vcl/unx/kde4/KDESalFrame.cxx
Dosyayı görüntüle @
c6fc963c
...
@@ -208,6 +208,10 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
...
@@ -208,6 +208,10 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
}
}
}
}
// Menu
std
::
unique_ptr
<
KMenuBar
>
pMenuBar
=
std
::
unique_ptr
<
KMenuBar
>
(
new
KMenuBar
()
);
QPalette
qMenuCG
=
pMenuBar
->
palette
();
Color
aFore
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
WindowText
)
);
Color
aFore
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
WindowText
)
);
Color
aBack
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
Window
)
);
Color
aBack
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
Window
)
);
Color
aText
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
Text
)
);
Color
aText
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
Text
)
);
...
@@ -215,6 +219,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
...
@@ -215,6 +219,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
Color
aButn
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
ButtonText
)
);
Color
aButn
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
ButtonText
)
);
Color
aMid
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
Mid
)
);
Color
aMid
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
Mid
)
);
Color
aHigh
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
Highlight
)
);
Color
aHigh
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
Highlight
)
);
Color
aHighText
=
toColor
(
pal
.
color
(
QPalette
::
Active
,
QPalette
::
HighlightedText
)
);
style
.
SetSkipDisabledInMenus
(
TRUE
);
// Foreground
// Foreground
style
.
SetRadioCheckTextColor
(
aFore
);
style
.
SetRadioCheckTextColor
(
aFore
);
...
@@ -257,7 +264,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
...
@@ -257,7 +264,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
// Selection
// Selection
style
.
SetHighlightColor
(
aHigh
);
style
.
SetHighlightColor
(
aHigh
);
style
.
SetHighlightTextColor
(
toColor
(
pal
.
color
(
QPalette
::
HighlightedText
))
);
style
.
SetHighlightTextColor
(
aHighText
);
// Tooltip
// Tooltip
style
.
SetHelpColor
(
toColor
(
QToolTip
::
palette
().
color
(
QPalette
::
Active
,
QPalette
::
ToolTipBase
)));
style
.
SetHelpColor
(
toColor
(
QToolTip
::
palette
().
color
(
QPalette
::
Active
,
QPalette
::
ToolTipBase
)));
...
@@ -269,7 +276,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
...
@@ -269,7 +276,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style
.
SetAppFont
(
aFont
);
style
.
SetAppFont
(
aFont
);
style
.
SetMenuFont
(
aFont
);
// will be changed according to pMenuBar
style
.
SetMenuFont
(
aFont
);
// will be changed according to pMenuBar
//style.SetToolFont( aFont ); //already set above
style
.
SetLabelFont
(
aFont
);
style
.
SetLabelFont
(
aFont
);
style
.
SetInfoFont
(
aFont
);
style
.
SetInfoFont
(
aFont
);
style
.
SetRadioCheckFont
(
aFont
);
style
.
SetRadioCheckFont
(
aFont
);
...
@@ -291,13 +297,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
...
@@ -291,13 +297,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
int
flash_time
=
QApplication
::
cursorFlashTime
();
int
flash_time
=
QApplication
::
cursorFlashTime
();
style
.
SetCursorBlinkTime
(
flash_time
!=
0
?
flash_time
/
2
:
STYLE_CURSOR_NOBLINKTIME
);
style
.
SetCursorBlinkTime
(
flash_time
!=
0
?
flash_time
/
2
:
STYLE_CURSOR_NOBLINKTIME
);
// Menu
style
.
SetSkipDisabledInMenus
(
TRUE
);
std
::
unique_ptr
<
KMenuBar
>
pMenuBar
=
std
::
unique_ptr
<
KMenuBar
>
(
new
KMenuBar
()
);
// Color
QPalette
qMenuCG
=
pMenuBar
->
palette
();
// Menu text and background color, theme specific
// Menu text and background color, theme specific
Color
aMenuFore
=
toColor
(
qMenuCG
.
color
(
QPalette
::
WindowText
)
);
Color
aMenuFore
=
toColor
(
qMenuCG
.
color
(
QPalette
::
WindowText
)
);
Color
aMenuBack
=
toColor
(
qMenuCG
.
color
(
QPalette
::
Window
)
);
Color
aMenuBack
=
toColor
(
qMenuCG
.
color
(
QPalette
::
Window
)
);
...
@@ -307,7 +306,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
...
@@ -307,7 +306,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style
.
SetMenuColor
(
aMenuBack
);
style
.
SetMenuColor
(
aMenuBack
);
style
.
SetMenuBarColor
(
aMenuBack
);
style
.
SetMenuBarColor
(
aMenuBack
);
style
.
SetMenuHighlightColor
(
toColor
(
qMenuCG
.
color
(
QPalette
::
Highlight
)
)
);
style
.
SetMenuHighlightColor
(
toColor
(
qMenuCG
.
color
(
QPalette
::
Highlight
)
)
);
style
.
SetMenuHighlightTextColor
(
aMenuFore
);
style
.
SetMenuHighlightTextColor
(
toColor
(
qMenuCG
.
color
(
QPalette
::
HighlightedText
)
)
);
// set special menubar higlight text color
// set special menubar higlight text color
if
(
QApplication
::
style
()
->
inherits
(
"HighContrastStyle"
)
)
if
(
QApplication
::
style
()
->
inherits
(
"HighContrastStyle"
)
)
...
...
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