chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

obsolescence fix wheelEvent

Browse Source
This commit is contained in:
LoudSnorer 2023-02-13 16:53:36 -05:00
parent 10a583dfb7
commit ea5756b24f
2 changed files with 126 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
oscar/Graphs/gGraph.cpp
View File

@ -24,6 +24,64 @@
extern MainWindow *mainwin;
#if 0
/*
from qt 4.8
int QGraphicsSceneWheelEvent::delta() const
Returns the distance that the wheel is rotated, in eighths (1/8s) of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user.
int QWheelEvent::delta () const
Returns the distance that the wheel is rotated, in eighths of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user.
Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of 120; i.e., 120 units * 1/8 = 15 degrees.
However, some mice have finer-resolution wheels and send delta values that are less than 120 units (less than 15 degrees). To support this possibility, you can either cumulatively add the delta values from events until the value of 120 is reached, then scroll the widget, or you can partially scroll the widget in response to each wheel event.
Example:
void MyWidget::wheelEvent(QWheelEvent *event)
{
int numDegrees = event->delta() / 8;
int numSteps = numDegrees / 15;
if ( isWheelEventHorizontal(event) ) {
scrollHorizontally(numSteps);
} else {
scrollVertically(numSteps);
}
event->accept();
}
from qt 5.15
Returns the relative amount that the wheel was rotated, in eighths of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user. angleDelta().y() provides the angle through which the common vertical mouse wheel was rotated since the previous event. angleDelta().x() provides the angle through which the horizontal mouse wheel was rotated, if the mouse has a horizontal wheel; otherwise it stays at zero. Some mice allow the user to tilt the wheel to perform horizontal scrolling, and some touchpads support a horizontal scrolling gesture; that will also appear in angleDelta().x().
Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of 120; i.e., 120 units * 1/8 = 15 degrees.
However, some mice have finer-resolution wheels and send delta values that are less than 120 units (less than 15 degrees). To support this possibility, you can either cumulatively add the delta values from events until the value of 120 is reached, then scroll the widget, or you can partially scroll the widget in response to each wheel event. But to provide a more native feel, you should prefer pixelDelta() on platforms where it's available.
*/
#endif
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define wheelEventPos( id ) id ->position()
#define wheelEventX( id ) id ->position().x()
#define wheelEventY( id ) id ->position().y()
#define wheelEventDelta( id ) id ->angleDelta().y()
#define isWheelEventVertical( id ) id ->angleDelta().x()==0
#define isWheelEventHorizontal( id ) id ->angleDelta().y()==0
#else
#define wheelEventPos( id ) id ->pos()
#define wheelEventX( id ) id ->x()
#define wheelEventY( id ) id ->y()
#define wheelEventDelta( id ) id ->delta()
#define isWheelEventVertical( id ) id ->orientation() == Qt::Vertical
#define isWheelEventHorizontal( id ) id ->orientation() == Qt::Horizontal
#endif
// Graph globals.
QFont *defaultfont = nullptr;
QFont *mediumfont = nullptr;
@ -1142,23 +1200,23 @@ void gGraph::mouseReleaseEvent(QMouseEvent *event)
void gGraph::wheelEvent(QWheelEvent *event)
{
qDebug() << m_title << "Wheel" << event->x() << event->y() << event->delta();
qDebug() << m_title << "Wheel" << wheelEventX(event) << wheelEventY(event) << wheelEventDelta(event);
//int y=event->pos().y();
if (event->orientation() == Qt::Horizontal) {
if ( isWheelEventHorizontal(event) ) {
return;
}
int x = event->pos().x() - m_graphview->titleWidth; //(left+m_marginleft);
int x = wheelEventPos( event).x() - m_graphview->titleWidth; //(left+m_marginleft);
if (event->delta() > 0) {
if (wheelEventDelta(event) > 0) {
ZoomX(0.75, x);
} else {
ZoomX(1.5, x);
}
int y = event->pos().y();
x = event->pos().x();
int y = wheelEventPos(event).y();
x = wheelEventPos(event).x();
for (const auto & layer : m_layers) {
if (layer->m_rect.contains(x, y)) {

65
oscar/Graphs/gGraphView.cpp
View File

@ -47,6 +47,65 @@
#include "SleepLib/profiles.h"
#include "overview.h"
#if 0
/*
from qt 4.8
int QGraphicsSceneWheelEvent::delta() const
Returns the distance that the wheel is rotated, in eighths (1/8s) of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user.
int QWheelEvent::delta () const
Returns the distance that the wheel is rotated, in eighths of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user.
Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of 120; i.e., 120 units * 1/8 = 15 degrees.
However, some mice have finer-resolution wheels and send delta values that are less than 120 units (less than 15 degrees). To support this possibility, you can either cumulatively add the delta values from events until the value of 120 is reached, then scroll the widget, or you can partially scroll the widget in response to each wheel event.
Example:
void MyWidget::wheelEvent(QWheelEvent *event)
{
int numDegrees = event->delta() / 8;
int numSteps = numDegrees / 15;
if ( isEventHorizontal(event) ) {
scrollHorizontally(numSteps);
} else {
scrollVertically(numSteps);
}
event->accept();
}
from qt 5.15
Returns the relative amount that the wheel was rotated, in eighths of a degree. A positive value indicates that the wheel was rotated forwards away from the user; a negative value indicates that the wheel was rotated backwards toward the user. angleDelta().y() provides the angle through which the common vertical mouse wheel was rotated since the previous event. angleDelta().x() provides the angle through which the horizontal mouse wheel was rotated, if the mouse has a horizontal wheel; otherwise it stays at zero. Some mice allow the user to tilt the wheel to perform horizontal scrolling, and some touchpads support a horizontal scrolling gesture; that will also appear in angleDelta().x().
Most mouse types work in steps of 15 degrees, in which case the delta value is a multiple of 120; i.e., 120 units * 1/8 = 15 degrees.
However, some mice have finer-resolution wheels and send delta values that are less than 120 units (less than 15 degrees). To support this possibility, you can either cumulatively add the delta values from events until the value of 120 is reached, then scroll the widget, or you can partially scroll the widget in response to each wheel event. But to provide a more native feel, you should prefer pixelDelta() on platforms where it's available.
*/
#endif
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define wheelEventPos( id ) id ->position()
#define wheelEventX( id ) id ->position().x()
#define wheelEventY( id ) id ->position().y()
#define wheelEventDelta( id ) id ->angleDelta().y()
#define isWheelEventVertical( id ) id ->angleDelta().x()==0
#define isWheelEventHorizontal( id ) id ->angleDelta().y()==0
#else
#define wheelEventPos( id ) id ->pos()
#define wheelEventX( id ) id ->x()
#define wheelEventY( id ) id ->y()
#define wheelEventDelta( id ) id ->delta()
#define isWheelEventVertical( id ) id ->orientation() == Qt::Vertical
#define isWheelEventHorizontal( id ) id ->orientation() == Qt::Horizontal
#endif
extern MainWindow *mainwin;
#include <QApplication>
@ -3065,7 +3124,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
if (event->modifiers() == Qt::NoModifier) {
int scrollDampening = AppSetting->scrollDampening();
if (event->orientation() == Qt::Vertical) { // Vertical Scrolling
if (isWheelEventVertical(event)) { // Vertical Scrolling
if (horizScrollTime.elapsed() < scrollDampening) {
return;
}
@ -3088,7 +3147,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
gGraph *graph = nullptr;
int group = 0;
//int x = event->x();
int y = event->y();
int y = wheelEventY(event);
float h, py = 0, pinned_height = 0;
@ -3172,7 +3231,7 @@ void gGraphView::wheelEvent(QWheelEvent *event)
double xx = (graph->max_x - graph->min_x);
double zoom = 240.0;
int delta = event->delta();
int delta = wheelEventDelta(event);
if (delta > 0) {
graph->min_x -= (xx / zoom) * (float)abs(delta);