From dd54495c4eb6fbc376fe5371a9b5c5434c528f4a Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Sat, 27 Oct 2018 10:51:39 -0700 Subject: [PATCH 1/2] Fixed regression in Qt::Background --- lib/rddatepicker.cpp | 51 +++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/lib/rddatepicker.cpp b/lib/rddatepicker.cpp index 4ac4ba46..2166aa79 100644 --- a/lib/rddatepicker.cpp +++ b/lib/rddatepicker.cpp @@ -82,12 +82,12 @@ RDDatePicker::RDDatePicker(int low_year,int high_year,QWidget *parent) // Date Labels // QPalette weekend_palette=palette(); - weekend_palette.setColor(QPalette::Active,QColorGroup::Background, + weekend_palette.setColor(QPalette::Active,QPalette::Background, palette().color(QPalette::Active, - QColorGroup::Mid)); - weekend_palette.setColor(QPalette::Inactive,QColorGroup::Background, + QPalette::Mid)); + weekend_palette.setColor(QPalette::Inactive,QPalette::Background, palette().color(QPalette::Active, - QColorGroup::Mid)); + QPalette::Mid)); QLabel *label=new QLabel(tr("Mo"),this,"monday_label"); label->setGeometry(RDDATEPICKER_X_ORIGIN,30,30,30); @@ -124,6 +124,7 @@ RDDatePicker::RDDatePicker(int low_year,int high_year,QWidget *parent) label->setFont(header_font); label->setAlignment(Qt::AlignCenter); label->setPalette(weekend_palette); + label->setAutoFillBackground(true); label=new QLabel(tr("Su"),this,"sunday_label"); label->setGeometry(RDDATEPICKER_X_ORIGIN+RDDATEPICKER_X_INTERVAL*6, @@ -131,6 +132,7 @@ RDDatePicker::RDDatePicker(int low_year,int high_year,QWidget *parent) label->setFont(header_font); label->setAlignment(Qt::AlignCenter); label->setPalette(weekend_palette); + label->setAutoFillBackground(true); for(int i=0;i<6;i++) { @@ -140,6 +142,7 @@ RDDatePicker::RDDatePicker(int low_year,int high_year,QWidget *parent) setGeometry(RDDATEPICKER_X_ORIGIN+RDDATEPICKER_X_INTERVAL*j, RDDATEPICKER_Y_ORIGIN+20+RDDATEPICKER_Y_INTERVAL*i,30,30); pick_date_label[i][j]->setAlignment(Qt::AlignTop|Qt::AlignHCenter); + pick_date_label[i][j]->setAutoFillBackground(true); } } PrintDays(); @@ -265,12 +268,12 @@ void RDDatePicker::PrintDays() // Clear Days // QPalette weekend_palette=palette(); - weekend_palette.setColor(QPalette::Active,QColorGroup::Background, + weekend_palette.setColor(QPalette::Active,QPalette::Background, palette().color(QPalette::Active, - QColorGroup::Mid)); - weekend_palette.setColor(QPalette::Inactive,QColorGroup::Background, + QPalette::Mid)); + weekend_palette.setColor(QPalette::Inactive,QPalette::Background, palette().color(QPalette::Active, - QColorGroup::Mid)); + QPalette::Mid)); for(int i=0;i<6;i++) { for(int j=0;j<5;j++) { pick_date_label[i][j]->clear(); @@ -324,26 +327,26 @@ void RDDatePicker::SelectDay(int day,int dow_offset,bool state) int dow=slot-7*week; QPalette pal=palette(); if(state) { - pal.setColor(QPalette::Active,QColorGroup::Foreground, + pal.setColor(QPalette::Active,QPalette::Foreground, palette(). - color(QPalette::Active,QColorGroup::HighlightedText)); - pal.setColor(QPalette::Active,QColorGroup::Background, - palette().color(QPalette::Active,QColorGroup::Highlight)); - pal.setColor(QPalette::Inactive,QColorGroup::Foreground, + color(QPalette::Active,QPalette::HighlightedText)); + pal.setColor(QPalette::Active,QPalette::Background, + palette().color(QPalette::Active,QPalette::Highlight)); + pal.setColor(QPalette::Inactive,QPalette::Foreground, palette(). - color(QPalette::Active,QColorGroup::HighlightedText)); - pal.setColor(QPalette::Inactive,QColorGroup::Background, - palette().color(QPalette::Active,QColorGroup::Highlight)); + color(QPalette::Active,QPalette::HighlightedText)); + pal.setColor(QPalette::Inactive,QPalette::Background, + palette().color(QPalette::Active,QPalette::Highlight)); } else { - pal.setColor(QPalette::Active,QColorGroup::Foreground, - palette().color(QPalette::Active,QColorGroup::Text)); - pal.setColor(QPalette::Active,QColorGroup::Background, - palette().color(QPalette::Active,QColorGroup::Background)); - pal.setColor(QPalette::Inactive,QColorGroup::Foreground, - palette().color(QPalette::Active,QColorGroup::Text)); - pal.setColor(QPalette::Inactive,QColorGroup::Background, - palette().color(QPalette::Active,QColorGroup::Background)); + pal.setColor(QPalette::Active,QPalette::Foreground, + palette().color(QPalette::Active,QPalette::Text)); + pal.setColor(QPalette::Active,QPalette::Background, + palette().color(QPalette::Active,QPalette::Background)); + pal.setColor(QPalette::Inactive,QPalette::Foreground, + palette().color(QPalette::Active,QPalette::Text)); + pal.setColor(QPalette::Inactive,QPalette::Background, + palette().color(QPalette::Active,QPalette::Background)); } pick_date_label[week][dow]->setPalette(pal); } From 256cc5742c02b9a994c268fcf67d73a5316f34e3 Mon Sep 17 00:00:00 2001 From: Patrick Linstruth Date: Mon, 29 Oct 2018 08:45:38 -0700 Subject: [PATCH 2/2] Updated ChangeLog --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index b3953f03..f6501d5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17894,3 +17894,6 @@ 2018-10-23 Fred Gleason * Fixed a bug in 'configure.ac' that caused detection of FLAC support to always fail. +2018-10-27 Patrick Linstruth + * Fixed regression where background colors are were not displayed + in the RDDatePicker calendar.