From a5e11111a44adcee429fccb786d60e5b7c85c355 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Tue, 31 Aug 2021 21:03:11 +0100 Subject: [PATCH] Link updating of hex value and opacity slider. --- common/dialogs/dialog_color_picker.cpp | 5 ++++- include/dialogs/dialog_color_picker.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/dialogs/dialog_color_picker.cpp b/common/dialogs/dialog_color_picker.cpp index a84306c631..201e8341be 100644 --- a/common/dialogs/dialog_color_picker.cpp +++ b/common/dialogs/dialog_color_picker.cpp @@ -511,7 +511,9 @@ void DIALOG_COLOR_PICKER::SetEditVals( CHANGED_COLOR aChanged, bool aCheckTransp if( aChanged != VAL_CHANGED ) m_sliderBrightness->SetValue(normalizeToInt( m_val ) ); - if( aChanged != HEX_CHANGED ) + if( aChanged == HEX_CHANGED ) + m_sliderTransparency->SetValue( normalizeToInt( m_newColor4D.a, ALPHA_MAX ) ); + else m_colorValue->ChangeValue( m_newColor4D.ToHexString() ); } @@ -731,6 +733,7 @@ void DIALOG_COLOR_PICKER::OnChangeAlpha( wxScrollEvent& event ) updatePreview( m_NewColorRect, m_newColor4D ); m_NewColorRect->Thaw(); m_NewColorRect->Refresh(); + SetEditVals( ALPHA_CHANGED, false ); } diff --git a/include/dialogs/dialog_color_picker.h b/include/dialogs/dialog_color_picker.h index 32e2e34f7c..e162e1e08d 100644 --- a/include/dialogs/dialog_color_picker.h +++ b/include/dialogs/dialog_color_picker.h @@ -71,6 +71,7 @@ enum CHANGED_COLOR RED_CHANGED, BLUE_CHANGED, GREEN_CHANGED, + ALPHA_CHANGED, HUE_CHANGED, SAT_CHANGED, VAL_CHANGED,