From 34b19e4ec318937629ce06d48db545fe6533d8b2 Mon Sep 17 00:00:00 2001 From: Chris Pavlina Date: Sat, 6 Jan 2018 21:27:08 -0700 Subject: [PATCH] HTML_MESSAGE_BOX: DPI-independent default size --- common/dialogs/dialog_display_info_HTML_base.cpp | 4 ++-- common/dialogs/dialog_display_info_HTML_base.fbp | 2 +- common/dialogs/dialog_display_info_HTML_base.h | 2 +- common/html_messagebox.cpp | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/dialogs/dialog_display_info_HTML_base.cpp b/common/dialogs/dialog_display_info_HTML_base.cpp index 3a76b4bea1..91d4e81e3c 100644 --- a/common/dialogs/dialog_display_info_HTML_base.cpp +++ b/common/dialogs/dialog_display_info_HTML_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Jan 2 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -11,7 +11,7 @@ DIALOG_DISPLAY_HTML_TEXT_BASE::DIALOG_DISPLAY_HTML_TEXT_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) { - this->SetSizeHints( wxSize( 400,120 ), wxDefaultSize ); + this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize ); wxBoxSizer* bMainSizer; bMainSizer = new wxBoxSizer( wxVERTICAL ); diff --git a/common/dialogs/dialog_display_info_HTML_base.fbp b/common/dialogs/dialog_display_info_HTML_base.fbp index 42c41a6f7c..180e95bdb3 100644 --- a/common/dialogs/dialog_display_info_HTML_base.fbp +++ b/common/dialogs/dialog_display_info_HTML_base.fbp @@ -41,7 +41,7 @@ 0 wxID_ANY - 400,120 + -1,-1 DIALOG_DISPLAY_HTML_TEXT_BASE -1,-1 diff --git a/common/dialogs/dialog_display_info_HTML_base.h b/common/dialogs/dialog_display_info_HTML_base.h index fd78c7b2d3..5bbaeacdf3 100644 --- a/common/dialogs/dialog_display_info_HTML_base.h +++ b/common/dialogs/dialog_display_info_HTML_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Nov 22 2017) +// C++ code generated with wxFormBuilder (version Jan 2 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/common/html_messagebox.cpp b/common/html_messagebox.cpp index 0abc8ef9dc..18e584071c 100644 --- a/common/html_messagebox.cpp +++ b/common/html_messagebox.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr - * Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors. + * Copyright (C) 2014-2018 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -34,6 +34,7 @@ HTML_MESSAGE_BOX::HTML_MESSAGE_BOX( wxWindow* parent, const wxString& aTitle, { m_htmlWindow->SetLayoutDirection( wxLayout_LeftToRight ); ListClear(); + SetSizeInDU( 240, 120 ); Center(); }