aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <moorekou@gmail.com>2015-11-23 08:27:24 -0500
committerKen Moore <moorekou@gmail.com>2015-11-23 08:27:24 -0500
commit39f546a870e33c5c418e07e4a762ee589cc92a52 (patch)
tree37b364309e4f59124ac3c92e8725e1a9a946d692
parentQuick checkpoint for the window manager: NOT STABLE - crashes on window close... (diff)
downloadlumina-39f546a870e33c5c418e07e4a762ee589cc92a52.tar.gz
lumina-39f546a870e33c5c418e07e4a762ee589cc92a52.tar.bz2
lumina-39f546a870e33c5c418e07e4a762ee589cc92a52.zip
Fix a typo in the backend variable name for custom panel colors.
-rw-r--r--lumina-config/PanelWidget.cpp2
-rw-r--r--lumina-desktop/LPanel.cpp5
2 files changed, 2 insertions, 5 deletions
diff --git a/lumina-config/PanelWidget.cpp b/lumina-config/PanelWidget.cpp
index 26c7d8e8..49b3d797 100644
--- a/lumina-config/PanelWidget.cpp
+++ b/lumina-config/PanelWidget.cpp
@@ -57,7 +57,7 @@ void PanelWidget::LoadSettings(QSettings *settings, int Dnum, int Pnum){
ui->spin_plength->setValue( settings->value( prefix+"lengthPercent",100).toInt() );
ui->spin_pxthick->setValue( settings->value( prefix+"height",30).toInt() );
ui->check_autohide->setChecked( settings->value(prefix+"hidepanel", false).toBool() );
- ui->group_customcolor->setChecked( settings->value(prefix+"customcolor",false).toBool() );
+ ui->group_customcolor->setChecked( settings->value(prefix+"customColor",false).toBool() );
ui->label_color_sample->setWhatsThis( settings->value(prefix+"color","rgba(255,255,255,160)").toString());
ui->list_plugins->clear();
QStringList plugs = settings->value(prefix+"pluginlist",QStringList()).toStringList();
diff --git a/lumina-desktop/LPanel.cpp b/lumina-desktop/LPanel.cpp
index 2eabc96e..b0ead2e0 100644
--- a/lumina-desktop/LPanel.cpp
+++ b/lumina-desktop/LPanel.cpp
@@ -188,13 +188,10 @@ void LPanel::UpdatePanel(bool geomonly){
this->move(hidepoint); //Could bleed over onto the screen right
}
}
- //With QT5, we need to make sure to reset window properties on occasion
- //LSession::handle()->XCB->SetDisableWMActions(this->winId()); //ensure no WM actions
- //LSession::handle()->XCB->SetAsSticky(this->winId());
if(DEBUG){ qDebug() << " - Done with panel geometry"; }
if(geomonly){ return; }
//Now update the appearance of the toolbar
- if(settings->value(PPREFIX+"customcolor", false).toBool()){
+ if(settings->value(PPREFIX+"customColor", false).toBool()){
QString color = settings->value(PPREFIX+"color", "rgba(255,255,255,160)").toString();
QString style = "QWidget#LuminaPanelColor{ background: %1; border-radius: 3px; border: 1px solid %1; }";
style = style.arg(color);
bgstack15