From da5f2366f90fb547b52879555bf901414b986218 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 18 Dec 2021 15:13:34 +0100 Subject: [PATCH] PANEL_SETUP_BOARD_STACKUP: fix a typo that prevent displaying a color swatch. Fixes #10027 https://gitlab.com/kicad/code/kicad/issues/10027 --- pcbnew/board_stackup_manager/panel_board_stackup.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pcbnew/board_stackup_manager/panel_board_stackup.cpp b/pcbnew/board_stackup_manager/panel_board_stackup.cpp index 724f99c86b..3b97dc7ef8 100644 --- a/pcbnew/board_stackup_manager/panel_board_stackup.cpp +++ b/pcbnew/board_stackup_manager/panel_board_stackup.cpp @@ -1440,12 +1440,14 @@ wxColor PANEL_SETUP_BOARD_STACKUP::getColorIconItem( int aRow ) void PANEL_SETUP_BOARD_STACKUP::updateIconColor( int aRow ) { + // explicit depth important under MSW. We use R,V,B 24 bits/pixel bitmap + const int bitmap_depth = 24; + if( aRow >= 0 ) { wxStaticBitmap* st_bitmap = m_rowUiItemsList[aRow].m_Icon; - // explicit depth important under MSW - wxBitmap bmp( m_colorIconsSize.x, m_colorIconsSize.y / 2, 28 ); + wxBitmap bmp( m_colorIconsSize.x, m_colorIconsSize.y / 2, bitmap_depth ); drawBitmap( bmp, getColorIconItem( aRow ) ); st_bitmap->SetBitmap( bmp ); return; @@ -1453,8 +1455,7 @@ void PANEL_SETUP_BOARD_STACKUP::updateIconColor( int aRow ) for( unsigned row = 0; row < m_rowUiItemsList.size(); row++ ) { - // explicit depth important under MSW - wxBitmap bmp( m_colorIconsSize.x, m_colorIconsSize.y / 2, 28 ); + wxBitmap bmp( m_colorIconsSize.x, m_colorIconsSize.y / 2, bitmap_depth ); drawBitmap( bmp, getColorIconItem( row ) ); m_rowUiItemsList[row].m_Icon->SetBitmap( bmp ); }