Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-19 17:11:15 +02:00
Code Issues Projects Releases Wiki Activity

2024-02-09 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a 'RDEventFilter' class.
	* Fixed bugs in rdairplay(1) that caused scroll bars to appear when
	loading web content into the message widget.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2024-02-09 17:38:32 -05:00
parent bfa31221f5
commit a14b878973
9 changed files with 141 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rdairplay/Makefile.am
View File

@@ -20,7 +20,7 @@
##
## Use automake to process this into a Makefile.in
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ -I/usr/include/qt5/QtWebKitWidgets @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ @IMAGEMAGICK_CFLAGS@
LIBS = -L$(top_srcdir)/lib
MOC = @QT_MOC@
@@ -82,7 +82,7 @@ nodist_rdairplay_SOURCES = moc_button_log.cpp\
moc_voicetracker.cpp\
moc_wall_clock.cpp
rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@ -lQt5WebKitWidgets
rdairplay_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT5_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
rdairplay_LDFLAGS = -rdynamic
EXTRA_DIST = rdairplay.pro\

28
rdairplay/messagewidget.cpp
View File

@@ -18,6 +18,12 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <QEvent>
#include <QKeyEvent>
#include <QWebFrame>
#include <rdeventfilter.h>
#include "colors.h"
#include "messagewidget.h"
@@ -43,7 +49,20 @@ MessageWidget::MessageWidget(QWidget *parent)
d_label->setWordWrap(true);
d_label->setAlignment(Qt::AlignCenter);
d_view=new QWebView(this);
connect(d_view,SIGNAL(loadFinished(bool)),
this,SLOT(webLoadFinishedData(bool)));
d_view->hide();
RDEventFilter *filter=new RDEventFilter(this);
filter->addFilter(QEvent::Enter);
filter->addFilter(QEvent::Leave);
filter->addFilter(QEvent::KeyPress);
filter->addFilter(QEvent::KeyRelease);
filter->addFilter(QEvent::MouseButtonPress);
filter->addFilter(QEvent::MouseButtonRelease);
filter->addFilter(QEvent::MouseButtonDblClick);
filter->addFilter(QEvent::MouseMove);
filter->addFilter(QEvent::Wheel);
d_view->installEventFilter(filter);
}
@@ -91,6 +110,15 @@ void MessageWidget::clear()
}
void MessageWidget::webLoadFinishedData(bool state)
{
d_view->page()->mainFrame()->
setScrollBarPolicy(Qt::Horizontal,Qt::ScrollBarAlwaysOff);
d_view->page()->mainFrame()->
setScrollBarPolicy(Qt::Vertical,Qt::ScrollBarAlwaysOff);
}
void MessageWidget::resizeEvent(QResizeEvent *e)
{
d_label->setGeometry(0,0,size().width(),size().height());

3
rdairplay/messagewidget.h
View File

@@ -36,6 +36,9 @@ class MessageWidget : public QWidget
bool setUrl(const QString &url);
void clear();
private slots:
void webLoadFinishedData(bool state);
protected:
void resizeEvent(QResizeEvent *e);