Skip to content

Commit

Permalink
Remove custom mouse press event code from opacity slider (#19243) (#1…
Browse files Browse the repository at this point in the history
  • Loading branch information
JustinPrivitera committed Jan 17, 2024
1 parent ccc57a7 commit ecc9b7c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
17 changes: 4 additions & 13 deletions src/gui/QvisOpacitySlider.C
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@ QvisOpacitySlider::paintEvent(QPaintEvent *)
// Modifications:
// Brad Whitlock, Thu Jun 5 14:21:18 PDT 2008
// Qt 4.
//
//
// ****************************************************************************

Expand Down Expand Up @@ -969,6 +970,9 @@ QvisOpacitySlider::mousePressEvent(QMouseEvent *e)
// Creation: Thu Dec 7 12:46:37 PDT 2000
//
// Modifications:
// Justin Privitera, Tue Jan 16 15:32:16 PST 2024
// Remove custom code snapping the slider value to zero when dragging it
// outside the window.
//
// ****************************************************************************

Expand All @@ -978,19 +982,6 @@ QvisOpacitySlider::mouseMoveEvent(QMouseEvent *e)
if(state != Dragging)
return;

QRect r = rect();
int m = maximumSliderDragDistance();
if(m >= 0)
{
r.setRect(r.x() - m, r.y() - 2*m/3,
r.width() + 2*m, r.height() + 3*m);
if(!r.contains(e->pos()))
{
moveSlider( positionFromValue( sliderStartVal) );
return;
}
}

moveSlider(e->pos().x() - clickOffset );
}

Expand Down
1 change: 1 addition & 0 deletions src/resources/help/en_US/relnotes3.4.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<li>Fixed a Cube reader bug that didn't read in multiple orbital data files correctly.</li>
<li>Fixed a bug with the Expression window that caused the 'Python' editor to be the default tab when the window was first opened.</li>
<li>Fixed a bug with the Cartographic Projection operator where the projections were a no-op.</li>
<li>Removed custom logic forcing the opacity slider to snap to zero if the mouse dragged the slider outside the widget it belongs to.</li>
</ul>

<a name="Enhancements"></a>
Expand Down

0 comments on commit ecc9b7c

Please sign in to comment.