From b41cd7981e4c08316952a8016ab51428b0a73fa7 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Wed, 17 Jan 2024 22:52:01 -0500
Subject: [PATCH] Try and fix pcm somewhat with FromDIP
We really need FromDIP in the base class to get things correct ugh
---
kicad/pcm/dialogs/dialog_pcm.cpp | 3 +++
kicad/pcm/dialogs/panel_package.cpp | 5 ++++-
kicad/pcm/dialogs/panel_packages_view.cpp | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/kicad/pcm/dialogs/dialog_pcm.cpp b/kicad/pcm/dialogs/dialog_pcm.cpp
index a4337bdad3..628b21ad58 100644
--- a/kicad/pcm/dialogs/dialog_pcm.cpp
+++ b/kicad/pcm/dialogs/dialog_pcm.cpp
@@ -57,6 +57,9 @@ DIALOG_PCM::DIALOG_PCM( wxWindow* parent, std::shared_ptr<PLUGIN_CONTENT_MANAGER
DIALOG_PCM_BASE( parent ),
m_pcm( pcm )
{
+ // correct the min size from wxfb with fromdip
+ SetMinSize( FromDIP( GetMinSize() ) );
+
SetDoubleBuffered( true );
m_defaultBitmap = KiBitmap( BITMAPS::icon_pcm );
diff --git a/kicad/pcm/dialogs/panel_package.cpp b/kicad/pcm/dialogs/panel_package.cpp
index 522fabd939..2ba4784156 100644
--- a/kicad/pcm/dialogs/panel_package.cpp
+++ b/kicad/pcm/dialogs/panel_package.cpp
@@ -30,6 +30,9 @@ PANEL_PACKAGE::PANEL_PACKAGE( wxWindow* parent, const ActionCallback& aCallback,
m_pinCallback( aPinCallback ),
m_data( aData )
{
+ // correct the min size from wxfb with fromdip
+ SetMinSize( FromDIP( GetMinSize() ) );
+
// Propagate clicks on static elements to the panel handler.
m_name->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( PANEL_PACKAGE::OnClick ), NULL, this );
m_desc->Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( PANEL_PACKAGE::OnClick ), NULL, this );
@@ -57,7 +60,7 @@ PANEL_PACKAGE::PANEL_PACKAGE( wxWindow* parent, const ActionCallback& aCallback,
int nameLineHeight = m_name->GetTextExtent( wxT( "X" ) ).GetHeight();
wxSize minSize = GetMinSize();
- minSize.y = std::max( nameLineHeight + KiROUND( descLineHeight ) + 15, m_minHeight );
+ minSize.y = std::max( nameLineHeight + KiROUND( descLineHeight ) + FromDIP( 15 ), m_minHeight );
SetMinSize( minSize );
m_splitButton->SetLabel( _( "Update" ) );
diff --git a/kicad/pcm/dialogs/panel_packages_view.cpp b/kicad/pcm/dialogs/panel_packages_view.cpp
index a3aa4d5a88..391c41403d 100644
--- a/kicad/pcm/dialogs/panel_packages_view.cpp
+++ b/kicad/pcm/dialogs/panel_packages_view.cpp
@@ -65,7 +65,7 @@ PANEL_PACKAGES_VIEW::PANEL_PACKAGES_VIEW( wxWindow*
m_splitter1->Connect( wxEVT_IDLE, wxIdleEventHandler( PANEL_PACKAGES_VIEW::SetSashOnIdle ),
NULL, this );
- m_splitter1->SetPaneMinimums( 350, 450 );
+ m_splitter1->SetPaneMinimums( FromDIP( 350 ), FromDIP( 450 ) );
#ifdef __WXGTK__
// wxSearchCtrl vertical height is not calculated correctly on some GTK setups