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
7b8c9798
Kaydet (Commit)
7b8c9798
authored
Eki 30, 2017
tarafından
Jan-Marek Glogowski
Kaydeden (comit)
Thorsten Behrens
Kas 06, 2017
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
QT5 implement cursor support
Change-Id: Ie47b8def36d67255b61eab04bc7e3818bb1d8ea8
üst
b66a7cbd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
182 additions
and
3 deletions
+182
-3
Qt5Data.cxx
vcl/qt5/Qt5Data.cxx
+162
-3
Qt5Data.hxx
vcl/qt5/Qt5Data.hxx
+9
-0
Qt5Frame.cxx
vcl/qt5/Qt5Frame.cxx
+10
-0
Qt5Frame.hxx
vcl/qt5/Qt5Frame.hxx
+1
-0
No files found.
vcl/qt5/Qt5Data.cxx
Dosyayı görüntüle @
7b8c9798
...
...
@@ -17,14 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <QtWidgets/QStyle>
#include <QtWidgets/QApplication>
#include "Qt5Data.hxx"
#include <QtGui/QCursor>
#include <QtGui/QBitmap>
#include <unx/x11_cursors/salcursors.h>
Qt5Data
::
Qt5Data
(
SalInstance
*
pInstance
)
:
GenericUnixSalData
(
SAL_DATA_QT5
,
pInstance
)
{
for
(
QCursor
*
&
rpCsr
:
m_aCursors
)
rpCsr
=
nullptr
;
ImplSVData
*
pSVData
=
ImplGetSVData
();
// draw toolbars on separate lines
...
...
@@ -35,8 +40,162 @@ Qt5Data::Qt5Data( SalInstance *pInstance )
Qt5Data
::~
Qt5Data
()
{
for
(
QCursor
*
&
rpCsr
:
m_aCursors
)
delete
rpCsr
;
}
static
QCursor
*
getQCursorFromXBM
(
const
unsigned
char
*
pBitmap
,
const
unsigned
char
*
pMask
,
int
nWidth
,
int
nHeight
,
int
nXHot
,
int
nYHot
)
{
QBitmap
aPixmap
;
aPixmap
.
loadFromData
(
pBitmap
,
nWidth
*
nHeight
/
8
,
"XPM"
);
QBitmap
aMask
;
aMask
.
loadFromData
(
pMask
,
nWidth
*
nHeight
/
8
,
"XPM"
);
aPixmap
.
setMask
(
aMask
);
return
new
QCursor
(
aPixmap
,
nXHot
,
nYHot
);
}
#define MAKE_CURSOR( vcl_name, name ) \
case vcl_name: \
pCursor = getQCursorFromXBM( name##curs##_bits, name##mask##_bits, \
name##curs_width, name##curs_height, \
name##curs_x_hot, name##curs_y_hot ); \
break
#define MAP_BUILTIN( vcl_name, qt_enum ) \
case vcl_name: \
pCursor = new QCursor( qt_enum ); \
break
QCursor
&
Qt5Data
::
getCursor
(
PointerStyle
ePointerStyle
)
{
if
(
!
m_aCursors
[
ePointerStyle
]
)
{
QCursor
*
pCursor
=
nullptr
;
switch
(
ePointerStyle
)
{
MAP_BUILTIN
(
PointerStyle
::
Arrow
,
Qt
::
ArrowCursor
);
MAP_BUILTIN
(
PointerStyle
::
Text
,
Qt
::
IBeamCursor
);
MAP_BUILTIN
(
PointerStyle
::
Help
,
Qt
::
WhatsThisCursor
);
MAP_BUILTIN
(
PointerStyle
::
Cross
,
Qt
::
CrossCursor
);
MAP_BUILTIN
(
PointerStyle
::
Wait
,
Qt
::
WaitCursor
);
MAP_BUILTIN
(
PointerStyle
::
NSize
,
Qt
::
SizeVerCursor
);
MAP_BUILTIN
(
PointerStyle
::
SSize
,
Qt
::
SizeVerCursor
);
MAP_BUILTIN
(
PointerStyle
::
WSize
,
Qt
::
SizeHorCursor
);
MAP_BUILTIN
(
PointerStyle
::
ESize
,
Qt
::
SizeHorCursor
);
MAP_BUILTIN
(
PointerStyle
::
NWSize
,
Qt
::
SizeFDiagCursor
);
MAP_BUILTIN
(
PointerStyle
::
NESize
,
Qt
::
SizeBDiagCursor
);
MAP_BUILTIN
(
PointerStyle
::
SWSize
,
Qt
::
SizeBDiagCursor
);
MAP_BUILTIN
(
PointerStyle
::
SESize
,
Qt
::
SizeFDiagCursor
);
#if 0
MAP_BUILTIN( PointerStyle::WindowNSize, GDK_TOP_SIDE );
MAP_BUILTIN( PointerStyle::WindowSSize, GDK_BOTTOM_SIDE );
MAP_BUILTIN( PointerStyle::WindowWSize, GDK_LEFT_SIDE );
MAP_BUILTIN( PointerStyle::WindowESize, GDK_RIGHT_SIDE );
#endif
MAP_BUILTIN
(
PointerStyle
::
WindowNWSize
,
Qt
::
SizeFDiagCursor
);
MAP_BUILTIN
(
PointerStyle
::
WindowNESize
,
Qt
::
SizeBDiagCursor
);
MAP_BUILTIN
(
PointerStyle
::
WindowSWSize
,
Qt
::
SizeBDiagCursor
);
MAP_BUILTIN
(
PointerStyle
::
WindowSESize
,
Qt
::
SizeFDiagCursor
);
MAP_BUILTIN
(
PointerStyle
::
HSizeBar
,
Qt
::
SizeHorCursor
);
MAP_BUILTIN
(
PointerStyle
::
VSizeBar
,
Qt
::
SizeVerCursor
);
MAP_BUILTIN
(
PointerStyle
::
RefHand
,
Qt
::
OpenHandCursor
);
MAP_BUILTIN
(
PointerStyle
::
Hand
,
Qt
::
OpenHandCursor
);
#if 0
MAP_BUILTIN( PointerStyle::Pen, GDK_PENCIL );
#endif
MAP_BUILTIN
(
PointerStyle
::
HSplit
,
Qt
::
SizeHorCursor
);
MAP_BUILTIN
(
PointerStyle
::
VSplit
,
Qt
::
SizeVerCursor
);
MAP_BUILTIN
(
PointerStyle
::
Move
,
Qt
::
SizeAllCursor
);
MAP_BUILTIN
(
PointerStyle
::
Null
,
Qt
::
BlankCursor
);
MAKE_CURSOR
(
PointerStyle
::
Magnify
,
magnify_
);
MAKE_CURSOR
(
PointerStyle
::
Fill
,
fill_
);
MAKE_CURSOR
(
PointerStyle
::
MoveData
,
movedata_
);
MAKE_CURSOR
(
PointerStyle
::
CopyData
,
copydata_
);
MAKE_CURSOR
(
PointerStyle
::
MoveFile
,
movefile_
);
MAKE_CURSOR
(
PointerStyle
::
CopyFile
,
copyfile_
);
MAKE_CURSOR
(
PointerStyle
::
MoveFiles
,
movefiles_
);
MAKE_CURSOR
(
PointerStyle
::
CopyFiles
,
copyfiles_
);
MAKE_CURSOR
(
PointerStyle
::
NotAllowed
,
nodrop_
);
MAKE_CURSOR
(
PointerStyle
::
Rotate
,
rotate_
);
MAKE_CURSOR
(
PointerStyle
::
HShear
,
hshear_
);
MAKE_CURSOR
(
PointerStyle
::
VShear
,
vshear_
);
MAKE_CURSOR
(
PointerStyle
::
DrawLine
,
drawline_
);
MAKE_CURSOR
(
PointerStyle
::
DrawRect
,
drawrect_
);
MAKE_CURSOR
(
PointerStyle
::
DrawPolygon
,
drawpolygon_
);
MAKE_CURSOR
(
PointerStyle
::
DrawBezier
,
drawbezier_
);
MAKE_CURSOR
(
PointerStyle
::
DrawArc
,
drawarc_
);
MAKE_CURSOR
(
PointerStyle
::
DrawPie
,
drawpie_
);
MAKE_CURSOR
(
PointerStyle
::
DrawCircleCut
,
drawcirclecut_
);
MAKE_CURSOR
(
PointerStyle
::
DrawEllipse
,
drawellipse_
);
MAKE_CURSOR
(
PointerStyle
::
DrawConnect
,
drawconnect_
);
MAKE_CURSOR
(
PointerStyle
::
DrawText
,
drawtext_
);
MAKE_CURSOR
(
PointerStyle
::
Mirror
,
mirror_
);
MAKE_CURSOR
(
PointerStyle
::
Crook
,
crook_
);
MAKE_CURSOR
(
PointerStyle
::
Crop
,
crop_
);
MAKE_CURSOR
(
PointerStyle
::
MovePoint
,
movepoint_
);
MAKE_CURSOR
(
PointerStyle
::
MoveBezierWeight
,
movebezierweight_
);
MAKE_CURSOR
(
PointerStyle
::
DrawFreehand
,
drawfreehand_
);
MAKE_CURSOR
(
PointerStyle
::
DrawCaption
,
drawcaption_
);
MAKE_CURSOR
(
PointerStyle
::
LinkData
,
linkdata_
);
MAKE_CURSOR
(
PointerStyle
::
MoveDataLink
,
movedlnk_
);
MAKE_CURSOR
(
PointerStyle
::
CopyDataLink
,
copydlnk_
);
MAKE_CURSOR
(
PointerStyle
::
LinkFile
,
linkfile_
);
MAKE_CURSOR
(
PointerStyle
::
MoveFileLink
,
moveflnk_
);
MAKE_CURSOR
(
PointerStyle
::
CopyFileLink
,
copyflnk_
);
MAKE_CURSOR
(
PointerStyle
::
Chart
,
chart_
);
MAKE_CURSOR
(
PointerStyle
::
Detective
,
detective_
);
MAKE_CURSOR
(
PointerStyle
::
PivotCol
,
pivotcol_
);
MAKE_CURSOR
(
PointerStyle
::
PivotRow
,
pivotrow_
);
MAKE_CURSOR
(
PointerStyle
::
PivotField
,
pivotfld_
);
MAKE_CURSOR
(
PointerStyle
::
PivotDelete
,
pivotdel_
);
MAKE_CURSOR
(
PointerStyle
::
Chain
,
chain_
);
MAKE_CURSOR
(
PointerStyle
::
ChainNotAllowed
,
chainnot_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollN
,
asn_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollS
,
ass_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollW
,
asw_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollE
,
ase_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollNW
,
asnw_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollNE
,
asne_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollSW
,
assw_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollSE
,
asse_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollNS
,
asns_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollWE
,
aswe_
);
MAKE_CURSOR
(
PointerStyle
::
AutoScrollNSWE
,
asnswe_
);
MAKE_CURSOR
(
PointerStyle
::
TextVertical
,
vertcurs_
);
MAKE_CURSOR
(
PointerStyle
::
TabSelectS
,
tblsels_
);
MAKE_CURSOR
(
PointerStyle
::
TabSelectE
,
tblsele_
);
MAKE_CURSOR
(
PointerStyle
::
TabSelectSE
,
tblselse_
);
MAKE_CURSOR
(
PointerStyle
::
TabSelectW
,
tblselw_
);
MAKE_CURSOR
(
PointerStyle
::
TabSelectSW
,
tblselsw_
);
MAKE_CURSOR
(
PointerStyle
::
HideWhitespace
,
hidewhitespace_
);
MAKE_CURSOR
(
PointerStyle
::
ShowWhitespace
,
showwhitespace_
);
default
:
break
;
}
if
(
!
pCursor
)
{
pCursor
=
new
QCursor
(
Qt
::
ArrowCursor
);
SAL_WARN
(
"vcl.qt5"
,
"pointer "
<<
static_cast
<
int
>
(
ePointerStyle
)
<<
"not implemented"
);
}
m_aCursors
[
ePointerStyle
]
=
pCursor
;
}
return
*
m_aCursors
[
ePointerStyle
];
}
void
Qt5Data
::
ErrorTrapPush
()
{
}
...
...
vcl/qt5/Qt5Data.hxx
Dosyayı görüntüle @
7b8c9798
...
...
@@ -21,14 +21,23 @@
#include <unx/gendata.hxx>
#include <o3tl/enumarray.hxx>
#include <vcl/ptrstyle.hxx>
class
QCursor
;
class
Qt5Data
:
public
GenericUnixSalData
{
o3tl
::
enumarray
<
PointerStyle
,
QCursor
*>
m_aCursors
;
public
:
explicit
Qt5Data
(
SalInstance
*
pInstance
);
virtual
~
Qt5Data
()
override
;
virtual
void
ErrorTrapPush
()
override
;
virtual
bool
ErrorTrapPop
(
bool
bIgnoreError
=
true
)
override
;
QCursor
&
getCursor
(
PointerStyle
ePointerStyle
);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
vcl/qt5/Qt5Frame.cxx
Dosyayı görüntüle @
7b8c9798
...
...
@@ -23,6 +23,7 @@
#include "Qt5Instance.hxx"
#include "Qt5Graphics.hxx"
#include "Qt5Widget.hxx"
#include "Qt5Data.hxx"
#include <QtCore/QPoint>
#include <QtCore/QSize>
...
...
@@ -46,6 +47,7 @@ static void SvpDamageHandler( void *handle,
Qt5Frame
::
Qt5Frame
(
Qt5Frame
*
pParent
,
SalFrameStyleFlags
nStyle
,
bool
bUseCairo
)
:
m_bUseCairo
(
bUseCairo
)
,
m_bGraphicsInUse
(
false
)
,
m_ePointerStyle
(
PointerStyle
::
Arrow
)
{
Qt5Instance
*
pInst
=
static_cast
<
Qt5Instance
*>
(
GetSalData
()
->
m_pInstance
);
pInst
->
insertFrame
(
this
);
...
...
@@ -339,6 +341,14 @@ void Qt5Frame::ToTop( SalFrameToTop nFlags )
void
Qt5Frame
::
SetPointer
(
PointerStyle
ePointerStyle
)
{
QWindow
*
pWindow
=
m_pQWidget
->
window
()
->
windowHandle
();
if
(
!
pWindow
)
return
;
if
(
ePointerStyle
==
m_ePointerStyle
)
return
;
m_ePointerStyle
=
ePointerStyle
;
pWindow
->
setCursor
(
static_cast
<
Qt5Data
*>
(
GetSalData
()
)
->
getCursor
(
ePointerStyle
)
);
}
void
Qt5Frame
::
CaptureMouse
(
bool
bMouse
)
...
...
vcl/qt5/Qt5Frame.hxx
Dosyayı görüntüle @
7b8c9798
...
...
@@ -50,6 +50,7 @@ class Qt5Frame
bool
m_bGraphicsInUse
;
SalFrameStyleFlags
m_nStyle
;
Qt5Frame
*
m_pParent
;
PointerStyle
m_ePointerStyle
;
bool
isChild
(
bool
bPlug
=
true
,
bool
bSysChild
=
true
)
{
...
...
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