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
f2e0eafa
Kaydet (Commit)
f2e0eafa
authored
May 24, 2014
tarafından
Michael Meeks
Kaydeden (comit)
Markus Mohrhard
May 24, 2014
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Stub mouse move events propagation to 3D charts.
Change-Id: If87545df4b1caeece107a20e0c00df88fb8e6fd5
üst
9ef8f82c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
0 deletions
+23
-0
GL3DBarChart.cxx
chart2/source/view/charttypes/GL3DBarChart.cxx
+5
-0
GL3DBarChart.hxx
chart2/source/view/inc/GL3DBarChart.hxx
+1
-0
openglwin.hxx
include/vcl/openglwin.hxx
+5
-0
openglwin.cxx
vcl/source/window/openglwin.cxx
+12
-0
No files found.
chart2/source/view/charttypes/GL3DBarChart.cxx
Dosyayı görüntüle @
f2e0eafa
...
@@ -289,6 +289,11 @@ void GL3DBarChart::clickedAt(const Point& rPos)
...
@@ -289,6 +289,11 @@ void GL3DBarChart::clickedAt(const Point& rPos)
mpCamera
->
zoom
(
nId
);
mpCamera
->
zoom
(
nId
);
}
}
void
GL3DBarChart
::
mouseDragMove
(
const
Point
&
rPos
,
sal_uInt16
nButtons
)
{
// fprintf(stderr, "drag move %ld %ld (0x%x)\n", rPos.X(), rPos.Y(), nButtons);
}
void
GL3DBarChart
::
contextDestroyed
()
void
GL3DBarChart
::
contextDestroyed
()
{
{
mbValidContext
=
false
;
mbValidContext
=
false
;
...
...
chart2/source/view/inc/GL3DBarChart.hxx
Dosyayı görüntüle @
f2e0eafa
...
@@ -50,6 +50,7 @@ public:
...
@@ -50,6 +50,7 @@ public:
virtual
void
update
()
SAL_OVERRIDE
;
virtual
void
update
()
SAL_OVERRIDE
;
virtual
void
clickedAt
(
const
Point
&
rPos
)
SAL_OVERRIDE
;
virtual
void
clickedAt
(
const
Point
&
rPos
)
SAL_OVERRIDE
;
virtual
void
mouseDragMove
(
const
Point
&
rPos
,
sal_uInt16
nButtons
)
SAL_OVERRIDE
;
virtual
void
contextDestroyed
()
SAL_OVERRIDE
;
virtual
void
contextDestroyed
()
SAL_OVERRIDE
;
private
:
private
:
...
...
include/vcl/openglwin.hxx
Dosyayı görüntüle @
f2e0eafa
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
#ifndef INCLUDED_VCL_OPENGLWIN_HXX
#ifndef INCLUDED_VCL_OPENGLWIN_HXX
#define INCLUDED_VCL_OPENGLWIN_HXX
#define INCLUDED_VCL_OPENGLWIN_HXX
#include <vcl/event.hxx>
#include <vcl/syschild.hxx>
#include <vcl/syschild.hxx>
#include <vcl/vclopengl_dllapi.hxx>
#include <vcl/vclopengl_dllapi.hxx>
...
@@ -24,6 +25,7 @@ public:
...
@@ -24,6 +25,7 @@ public:
virtual
~
IRenderer
()
{}
virtual
~
IRenderer
()
{}
virtual
void
update
()
=
0
;
virtual
void
update
()
=
0
;
virtual
void
clickedAt
(
const
Point
&
rPos
)
=
0
;
virtual
void
clickedAt
(
const
Point
&
rPos
)
=
0
;
virtual
void
mouseDragMove
(
const
Point
&
rPos
,
sal_uInt16
nButtons
)
=
0
;
virtual
void
contextDestroyed
()
=
0
;
virtual
void
contextDestroyed
()
=
0
;
};
};
...
@@ -39,7 +41,10 @@ public:
...
@@ -39,7 +41,10 @@ public:
void
setRenderer
(
IRenderer
*
pRenderer
);
void
setRenderer
(
IRenderer
*
pRenderer
);
virtual
void
Paint
(
const
Rectangle
&
)
SAL_OVERRIDE
;
virtual
void
Paint
(
const
Rectangle
&
)
SAL_OVERRIDE
;
virtual
void
MouseButtonDown
(
const
MouseEvent
&
rMEvt
)
SAL_OVERRIDE
;
virtual
void
MouseButtonDown
(
const
MouseEvent
&
rMEvt
)
SAL_OVERRIDE
;
virtual
void
MouseButtonUp
(
const
MouseEvent
&
rMEvt
)
SAL_OVERRIDE
;
virtual
void
MouseMove
(
const
MouseEvent
&
rMEvt
)
SAL_OVERRIDE
;
private
:
private
:
boost
::
scoped_ptr
<
OpenGLWindowImpl
>
mpImpl
;
boost
::
scoped_ptr
<
OpenGLWindowImpl
>
mpImpl
;
...
...
vcl/source/window/openglwin.cxx
Dosyayı görüntüle @
f2e0eafa
...
@@ -65,6 +65,18 @@ void OpenGLWindow::MouseButtonDown( const MouseEvent& rMEvt )
...
@@ -65,6 +65,18 @@ void OpenGLWindow::MouseButtonDown( const MouseEvent& rMEvt )
mpRenderer
->
clickedAt
(
aPoint
);
mpRenderer
->
clickedAt
(
aPoint
);
}
}
void
OpenGLWindow
::
MouseButtonUp
(
const
MouseEvent
&
/* rMEvt */
)
{
// in case we need to track button state ourselves.
}
void
OpenGLWindow
::
MouseMove
(
const
MouseEvent
&
rMEvt
)
{
if
(
rMEvt
.
GetButtons
())
mpRenderer
->
mouseDragMove
(
rMEvt
.
GetPosPixel
(),
rMEvt
.
GetButtons
());
}
void
OpenGLWindow
::
setRenderer
(
IRenderer
*
pRenderer
)
void
OpenGLWindow
::
setRenderer
(
IRenderer
*
pRenderer
)
{
{
mpRenderer
=
pRenderer
;
mpRenderer
=
pRenderer
;
...
...
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