Skip to content

Functional draft for backlight scrollwheel feature #2268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion plugin-backlight/backlight.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* END_COMMON_COPYRIGHT_HEADER */

#include "backlight.h"
#include <QEvent>
#include <QWheelEvent>

LXQtBacklight::LXQtBacklight(const ILXQtPanelPluginStartupInfo &startupInfo):
QObject(),
Expand All @@ -35,6 +35,10 @@ LXQtBacklight::LXQtBacklight(const ILXQtPanelPluginStartupInfo &startupInfo):
// use our own icon
m_backlightButton->setIcon(QIcon::fromTheme(QStringLiteral("brightnesssettings")));

// NOTE: Redirect (mouse) events to LXQtBacklight event filter
m_backlightButton->setMouseTracking(true);
m_backlightButton->installEventFilter(this);

connect(m_backlightButton, &QToolButton::clicked, this, &LXQtBacklight::showSlider);

m_backlightSlider = nullptr;
Expand All @@ -61,6 +65,25 @@ void LXQtBacklight::deleteSlider()
//printf("Deleted\n");
}

bool LXQtBacklight::eventFilter(QObject *obj, QEvent *event)
{
if (obj == m_backlightButton) {
if (event->type() == QEvent::Wheel) {
if(! m_backlightSlider) {
// NOTE: Workaround to prevent crash
// TODO: The event can probably be handled directly in the plugin
m_backlightSlider = new SliderDialog(m_backlightButton);
connect(m_backlightSlider, &SliderDialog::dialogClosed, this, &LXQtBacklight::deleteSlider);
}
auto ev = static_cast<QWheelEvent*>(event);
m_backlightSlider->handleWheelEvent(ev);
return true;
}
}

return QObject::eventFilter(obj, event);
}

void LXQtBacklight::showSlider(bool)
{
if(! m_backlightSlider) {
Expand Down
3 changes: 3 additions & 0 deletions plugin-backlight/backlight.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ protected Q_SLOTS:
void showSlider(bool);
void deleteSlider();

protected:
bool eventFilter(QObject* obj, QEvent* event) override;

private:
QToolButton *m_backlightButton;
SliderDialog *m_backlightSlider;
Expand Down
14 changes: 13 additions & 1 deletion plugin-backlight/sliderdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include <QVBoxLayout>
#include <QFrame>
#include <QEvent>
#include <QWheelEvent>
#include <QDebug>
#include "sliderdialog.h"

Expand Down Expand Up @@ -106,6 +106,18 @@ void SliderDialog::updateBacklight()
m_slider->setValue( (m_backlight->getBacklight() * 100) / maxBacklight);
}

void SliderDialog::handleWheelEvent(QWheelEvent *event) {
auto cur_pos = m_slider->sliderPosition();
// auto cur_pos = m_backlight->getBacklight();
auto delta = event->angleDelta().y() / QWheelEvent::DefaultDeltasPerStep;
auto step = delta * m_slider->singleStep();
auto value = cur_pos + step;
qInfo().nospace() << "Handling backlight wheel event (set value: " << value << ")";
// m_slider->setSliderPosition(m_slider->sliderPosition()
// + (event->angleDelta().y() / QWheelEvent::DefaultDeltasPerStep * m_slider->singleStep()));
m_slider->setValue(value);
}

void SliderDialog::downButtonClicked(bool)
{
m_slider->setValue(m_slider->value() - 1);
Expand Down
3 changes: 2 additions & 1 deletion plugin-backlight/sliderdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ class SliderDialog: public QDialog
public:
SliderDialog(QWidget *parent);
void updateBacklight();
void handleWheelEvent(QWheelEvent* event);

Q_SIGNALS:
void dialogClosed();

protected:
bool event(QEvent *event) override;

private:
QSlider *m_slider;
QToolButton *m_upButton, *m_downButton;
Expand Down