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
485e4432
Kaydet (Commit)
485e4432
authored
Ock 06, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fix o3tl::typed_flags to bool conversions
Change-Id: Iaed915b3765a3d23aea7f771a7c912956d864c5b
üst
549b7fad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
salnativewidgets-kde.cxx
vcl/unx/kde/salnativewidgets-kde.cxx
+3
-3
KDESalGraphics.cxx
vcl/unx/kde4/KDESalGraphics.cxx
+1
-1
No files found.
vcl/unx/kde/salnativewidgets-kde.cxx
Dosyayı görüntüle @
485e4432
...
@@ -516,7 +516,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
...
@@ -516,7 +516,7 @@ bool WidgetPainter::drawStyledWidget( QWidget *pWidget,
pWidget
->
move
(
0
,
0
);
pWidget
->
move
(
0
,
0
);
// Enable/disable the widget
// Enable/disable the widget
pWidget
->
setEnabled
(
nState
&
ControlState
::
ENABLED
);
pWidget
->
setEnabled
(
bool
(
nState
&
ControlState
::
ENABLED
)
);
// Create pixmap to paint to
// Create pixmap to paint to
KDEX11Pixmap
xPixmap
(
pWidget
->
width
(),
pWidget
->
height
()
);
KDEX11Pixmap
xPixmap
(
pWidget
->
width
(),
pWidget
->
height
()
);
...
@@ -1413,7 +1413,7 @@ bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
...
@@ -1413,7 +1413,7 @@ bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart,
if
(
(
nType
==
CTRL_PUSHBUTTON
)
&&
(
nPart
==
PART_ENTIRE_CONTROL
)
)
if
(
(
nType
==
CTRL_PUSHBUTTON
)
&&
(
nPart
==
PART_ENTIRE_CONTROL
)
)
{
{
bReturn
=
pWidgetPainter
->
drawStyledWidget
(
bReturn
=
pWidgetPainter
->
drawStyledWidget
(
pWidgetPainter
->
pushButton
(
rControlRegion
,
(
nState
&
ControlState
::
DEFAULT
)
),
pWidgetPainter
->
pushButton
(
rControlRegion
,
bool
(
nState
&
ControlState
::
DEFAULT
)
),
nState
,
aValue
,
this
);
nState
,
aValue
,
this
);
}
}
else
if
(
(
nType
==
CTRL_RADIOBUTTON
)
&&
(
nPart
==
PART_ENTIRE_CONTROL
)
)
else
if
(
(
nType
==
CTRL_RADIOBUTTON
)
&&
(
nPart
==
PART_ENTIRE_CONTROL
)
)
...
@@ -1542,7 +1542,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
...
@@ -1542,7 +1542,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
{
{
// Metrics of the push button
// Metrics of the push button
case
CTRL_PUSHBUTTON
:
case
CTRL_PUSHBUTTON
:
pWidget
=
pWidgetPainter
->
pushButton
(
rControlRegion
,
(
nState
&
ControlState
::
DEFAULT
)
);
pWidget
=
pWidgetPainter
->
pushButton
(
rControlRegion
,
bool
(
nState
&
ControlState
::
DEFAULT
)
);
switch
(
nPart
)
switch
(
nPart
)
{
{
...
...
vcl/unx/kde4/KDESalGraphics.cxx
Dosyayı görüntüle @
485e4432
...
@@ -337,7 +337,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
...
@@ -337,7 +337,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
QStyleOptionMenuItem
option
;
QStyleOptionMenuItem
option
;
option
.
checkType
=
(
part
==
PART_MENU_ITEM_CHECK_MARK
)
option
.
checkType
=
(
part
==
PART_MENU_ITEM_CHECK_MARK
)
?
QStyleOptionMenuItem
::
NonExclusive
:
QStyleOptionMenuItem
::
Exclusive
;
?
QStyleOptionMenuItem
::
NonExclusive
:
QStyleOptionMenuItem
::
Exclusive
;
option
.
checked
=
(
nControlState
&
ControlState
::
PRESSED
)
?
true
:
false
;
option
.
checked
=
bool
(
nControlState
&
ControlState
::
PRESSED
)
;
// widgetRect is now the rectangle for the checkbox/radiobutton itself, but Qt
// widgetRect is now the rectangle for the checkbox/radiobutton itself, but Qt
// paints the whole menu item, so translate position (and it'll be clipped);
// paints the whole menu item, so translate position (and it'll be clipped);
// it is also necessary to fill the background transparently first, as this
// it is also necessary to fill the background transparently first, as this
...
...
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