mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify the mouse drag function

Browse Source 
Change-Id: I9639b2a29522ba0765f4442c2f78de56388fe754
This commit is contained in:
weigao
2014-06-16 23:40:36 -07:00
committed by Markus Mohrhard
parent af5dfd8af2
commit 8e19f8ebd8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
chart2/source/view/charttypes/GL3DBarChart.cxx
View File

@@ -416,19 +416,19 @@ void GL3DBarChart::clickedAt(const Point& rPos, sal_uInt16 nButtons)
pScreenText->render(); pScreenText->render();
} }
void GL3DBarChart::mouseDragMove(const Point& , const Point& , sal_uInt16 nButtons) void GL3DBarChart::mouseDragMove(const Point& rStartPos, const Point& rEndPos, sal_uInt16 )
{ {
if(mbBlockUserInput) if(mbBlockUserInput)
return; return;
mbBlockUserInput = true; mbBlockUserInput = true;
long direction = rEndPos.X() - rStartPos.X();
if(nButtons == MOUSE_RIGHT) if(direction < 0)
{ {
mnCornerId = (mnCornerId + 1) % 4; mnCornerId = (mnCornerId + 1) % 4;
moveToCorner(); moveToCorner();
} }
else if(nButtons == MOUSE_LEFT) else if(direction > 0)
{ {
mnCornerId = mnCornerId - 1; mnCornerId = mnCornerId - 1;
if(mnCornerId < 0) if(mnCornerId < 0)
@@ -439,33 +439,33 @@ void GL3DBarChart::mouseDragMove(const Point& , const Point& , sal_uInt16 nButto
glm::vec3 GL3DBarChart::getCornerPosition(sal_Int8 nId) glm::vec3 GL3DBarChart::getCornerPosition(sal_Int8 nId)
{ {
float pi = 3.1415926;
switch(nId) switch(nId)
{ {
case 0: case 0:
{ {
return glm::vec3(-30, -30, DEFAULT_CAMERA_HEIGHT); return glm::vec3(mnMaxX / 2 - mnDistance * sin(pi / 4), mnMaxY / 2 - mnDistance * cos(pi / 4), DEFAULT_CAMERA_HEIGHT * 2);
} }
break; break;
case 1: case 1:
{ {
return glm::vec3(mnMaxX, -30, DEFAULT_CAMERA_HEIGHT); return glm::vec3(mnMaxX / 2 + mnDistance * sin(pi / 4), mnMaxY / 2 - mnDistance * cos(pi / 4), DEFAULT_CAMERA_HEIGHT * 2);
} }
break; break;
case 2: case 2:
{ {
return glm::vec3(mnMaxX, mnMaxY, DEFAULT_CAMERA_HEIGHT); return glm::vec3(mnMaxX / 2 + mnDistance * sin(pi / 4), mnMaxY / 2 + mnDistance * cos(pi / 4), DEFAULT_CAMERA_HEIGHT * 2);
} }
break; break;
case 3: case 3:
{ {
return glm::vec3(-30, mnMaxY, DEFAULT_CAMERA_HEIGHT); return glm::vec3(mnMaxX / 2 - mnDistance * sin(pi / 4), mnMaxY / 2 + mnDistance * cos(pi / 4), DEFAULT_CAMERA_HEIGHT * 2);
} }
break; break;
default: default:
assert(false); assert(false);
} }
return maDefaultCameraPosition;
return glm::vec3(-30, -30, DEFAULT_CAMERA_HEIGHT);
} }
void GL3DBarChart::moveToCorner() void GL3DBarChart::moveToCorner()