From bd3373e7665248315a6bebb99d838efe167cf2f6 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 13 Jan 2025 12:38:02 -0500 Subject: [PATCH 1/4] change background color to match system --- src/diffpy/pdfgui/gui/phaseconfigurepanel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py index 1050ef42..978f6591 100644 --- a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py +++ b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py @@ -332,7 +332,7 @@ def restrictConstrainedParameters(self): else: textCtrl.SetEditable(True) # textCtrl.SetBackgroundColour(txtbg) - textCtrl.SetBackgroundColour(wx.WHITE) + textCtrl.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_GRAYTEXT)) # Now the grid rows = self.gridAtoms.GetNumberRows() From 6662527277c2e18aaeac34e06be1f096e4ef395d Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Mon, 13 Jan 2025 12:40:33 -0500 Subject: [PATCH 2/4] news --- news/textbox-color.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/textbox-color.rst diff --git a/news/textbox-color.rst b/news/textbox-color.rst new file mode 100644 index 00000000..d8c98f14 --- /dev/null +++ b/news/textbox-color.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* Change background color to match system settings in `Phase Configuration`. + +**Security:** + +* From 344abff55eef43aaf923e4325aabef7cfdd22765 Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Wed, 15 Jan 2025 10:37:28 -0500 Subject: [PATCH 3/4] Comply with dataset config panels --- src/diffpy/pdfgui/gui/phaseconfigurepanel.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py index 978f6591..64be062e 100644 --- a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py +++ b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py @@ -320,6 +320,7 @@ def restrictConstrainedParameters(self): self.setToolTips(tooltips.phasepanel) self.textCtrlA.DefaultStyle.BackgroundColour + txtbg = self.textCtrlScaleFactor.DefaultStyle.BackgroundColour # First the TextCtrls for key, var in self.lConstraintsMap.items(): @@ -331,8 +332,8 @@ def restrictConstrainedParameters(self): tt.SetTip(self.constraints[var].formula) else: textCtrl.SetEditable(True) - # textCtrl.SetBackgroundColour(txtbg) - textCtrl.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_GRAYTEXT)) + textCtrl.SetBackgroundColour(txtbg) + # textCtrl.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_GRAYTEXT)) # Now the grid rows = self.gridAtoms.GetNumberRows() From e7d0b9efe671ce7eb0e467637196af2a5bed225b Mon Sep 17 00:00:00 2001 From: Caden Myers Date: Thu, 16 Jan 2025 20:23:10 -0500 Subject: [PATCH 4/4] remove comment --- src/diffpy/pdfgui/gui/phaseconfigurepanel.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py index 64be062e..365ecd76 100644 --- a/src/diffpy/pdfgui/gui/phaseconfigurepanel.py +++ b/src/diffpy/pdfgui/gui/phaseconfigurepanel.py @@ -333,7 +333,6 @@ def restrictConstrainedParameters(self): else: textCtrl.SetEditable(True) textCtrl.SetBackgroundColour(txtbg) - # textCtrl.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_GRAYTEXT)) # Now the grid rows = self.gridAtoms.GetNumberRows()