Skip to content
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

ColorPicker, Backlight, KbIndicator, and StatusNotifier styling fixes #1846

Closed
wants to merge 1 commit into from
Closed
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
2 changes: 2 additions & 0 deletions plugin-backlight/backlight.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ LXQtBacklight::LXQtBacklight(const ILXQtPanelPluginStartupInfo &startupInfo):
ILXQtPanelPlugin(startupInfo)
{
m_backlightButton = new QToolButton();

m_backlightButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
// use our own icon
m_backlightButton->setIcon(QIcon::fromTheme(QStringLiteral("brightnesssettings")));

Expand Down
4 changes: 2 additions & 2 deletions plugin-colorpicker/colorpicker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ void ColorPicker::realign()

ColorPickerWidget::ColorPickerWidget(QWidget *parent) : QWidget(parent)
{
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);

mSeparator = new QFrame();
mSeparator->setFrameShape(QFrame::VLine);
mSeparator->setFrameShadow(QFrame::Sunken);
Expand All @@ -89,12 +87,14 @@ ColorPickerWidget::ColorPickerWidget(QWidget *parent) : QWidget(parent)
mPickerButton->setObjectName(QStringLiteral("ColorPickerPickerButton"));
mPickerButton->setAccessibleName(mPickerButton->objectName());
mPickerButton->setAutoRaise(true);
mPickerButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
mPickerButton->setIcon(QIcon::fromTheme(QLatin1String("color-picker"), QIcon::fromTheme(QLatin1String("color-select-symbolic"))));

mColorButton = new ColorButton();
mColorButton->setObjectName(QStringLiteral("ColorPickerColorButton"));
mColorButton->setAccessibleName(mColorButton->objectName());
mColorButton->setAutoRaise(true);
mColorButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
mColorButton->setStyleSheet(QStringLiteral("::menu-indicator{ image: none; }"));

QBoxLayout *layout = new QBoxLayout(QBoxLayout::LeftToRight);
Expand Down
1 change: 1 addition & 0 deletions plugin-kbindicator/src/content.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ Content::Content(bool layoutEnabled):
m_layout = new QToolButton;
m_layout->setObjectName(QStringLiteral("LayoutLabel"));
m_layout->setAutoRaise(true);

connect(m_layout, &QAbstractButton::released, this, [this] { emit controlClicked(Controls::Layout); });
box->addWidget(m_layout, 0, Qt::AlignCenter);
}
Expand Down
1 change: 1 addition & 0 deletions plugin-statusnotifier/statusnotifierbutton.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ StatusNotifierButton::StatusNotifierButton(QString service, QString objectPath,
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
setAutoRaise(true);
setObjectName(QLatin1String("StatusNotifierButton"));
interface = new SniAsync(service, objectPath, QDBusConnection::sessionBus(), this);

connect(interface, &SniAsync::NewIcon, this, &StatusNotifierButton::newIcon);
Expand Down