| Summary: | right-clicking on sound control changes volume | ||
|---|---|---|---|
| Product: | [Applications] amarok | Reporter: | Silver Salonen <silver.salonen> |
| Component: | general | Assignee: | Amarok Bugs <amarok-bugs-null> |
| Status: | RESOLVED FIXED | ||
| Severity: | normal | CC: | adalvit |
| Priority: | NOR | ||
| Version First Reported In: | 1.4.5 | ||
| Target Milestone: | --- | ||
| Platform: | FreeBSD Ports | ||
| OS: | FreeBSD | ||
| Latest Commit: | Version Fixed/Implemented In: | ||
| Sentry Crash Report: | |||
|
Description
Silver Salonen
2007-02-14 09:20:24 UTC
SVN commit 633527 by markey:
Fix regression: right-clicking on sound control would change volume
BUG: 141672
M +9 -0 sliderwidget.cpp
M +1 -0 sliderwidget.h
--- branches/stable/extragear/multimedia/amarok/src/sliderwidget.cpp #633526:633527
@@ -414,6 +414,15 @@
}
void
+Amarok::VolumeSlider::mousePressEvent( QMouseEvent *e )
+{
+ if( e->button() != RightButton ) {
+ Amarok::Slider::mousePressEvent( e );
+ slideEvent( e );
+ }
+}
+
+void
Amarok::VolumeSlider::contextMenuEvent( QContextMenuEvent *e )
{
KPopupMenu menu;
--- branches/stable/extragear/multimedia/amarok/src/sliderwidget.h #633526:633527
@@ -129,6 +129,7 @@
virtual void leaveEvent( QEvent* );
virtual void paletteChange( const QPalette& );
virtual void slideEvent( QMouseEvent* );
+ virtual void mousePressEvent( QMouseEvent* );
virtual void contextMenuEvent( QContextMenuEvent* );
virtual void wheelEvent( QWheelEvent *e );
SVN commit 633534 by markey:
Forward-port bugfix from stable branch: Right-click on volume slider would change volume
CCBUG: 141672
M +9 -0 sliderwidget.cpp
M +1 -0 sliderwidget.h
--- trunk/extragear/multimedia/amarok/src/sliderwidget.cpp #633533:633534
@@ -441,6 +441,15 @@
}
void
+Amarok::VolumeSlider::mousePressEvent( QMouseEvent *e )
+{
+ if( e->button() != Qt::RightButton ) {
+ Amarok::Slider::mousePressEvent( e );
+ slideEvent( e );
+ }
+}
+
+void
Amarok::VolumeSlider::contextMenuEvent( QContextMenuEvent *e )
{
Q3PopupMenu menu;
--- trunk/extragear/multimedia/amarok/src/sliderwidget.h #633533:633534
@@ -136,6 +136,7 @@
virtual void leaveEvent( QEvent* );
virtual void paletteChange( const QPalette& );
virtual void slideEvent( QMouseEvent* );
+ virtual void mousePressEvent( QMouseEvent* );
virtual void contextMenuEvent( QContextMenuEvent* );
virtual void wheelEvent( QWheelEvent *e );
*** Bug 141948 has been marked as a duplicate of this bug. *** |