Implemented a font scaling in the same way as GrandOrgue does.

Author: larspalo

CMakeLists.txt

@@ -19,7 +19,7 @@ cmake_minimum_required(VERSION 3.10)
 # Set the project name and info
 project(
   GOODF
-  VERSION 0.6.1
+  VERSION 0.6.2
   DESCRIPTION "GOODF - Software for creating and editing GrandOrgue ODFs"
   LANGUAGES CXX C
 )

src/GUIPanelRepresentation.cpp

@@ -33,6 +33,8 @@ GUIPanelRepresentation::GUIPanelRepresentation(wxWindow *parent, const wxString&
 	m_EnclosureY = 0;
 	m_CenterY = 0;
 	m_CenterWidth = 0;
+	m_FontScale = 1.0;
+	InitFont();
 }
 
 GUIPanelRepresentation::~GUIPanelRepresentation() {
@@ -158,7 +160,11 @@ void GUIPanelRepresentation::RenderPanel(wxDC& dc) {
 					TileBitmap(imgRect, dc, theBmp, btnElement->getTileOffsetX(), btnElement->getTileOffsetY());
 
 					if (btnElement->getTextBreakWidth()) {
-						dc.SetFont(btnElement->getDispLabelFont());
+						wxFont theFont = btnElement->getDispLabelFont();
+						int pointSize = theFont.GetPointSize();
+						pointSize *= m_FontScale;
+						theFont.SetPointSize(pointSize);
+						dc.SetFont(theFont);
 						dc.SetBackgroundMode(wxTRANSPARENT);
 						dc.SetTextForeground(btnElement->getDispLabelColour()->getColor());
 						wxRect textRect(
@@ -233,7 +239,11 @@ void GUIPanelRepresentation::RenderPanel(wxDC& dc) {
 						TileBitmap(imgRect, dc, theBmp, btnElement->getTileOffsetX(), btnElement->getTileOffsetY());
 
 						if (btnElement->getTextBreakWidth()) {
-							dc.SetFont(btnElement->getDispLabelFont());
+							wxFont theFont = btnElement->getDispLabelFont();
+							int pointSize = theFont.GetPointSize();
+							pointSize *= m_FontScale;
+							theFont.SetPointSize(pointSize);
+							dc.SetFont(theFont);
 							dc.SetBackgroundMode(wxTRANSPARENT);
 							dc.SetTextForeground(btnElement->getDispLabelColour()->getColor());
 							wxRect textRect(
@@ -303,7 +313,11 @@ void GUIPanelRepresentation::RenderPanel(wxDC& dc) {
 						TileBitmap(imgRect, dc, theBmp, encElement->getTileOffsetX(), encElement->getTileOffsetY());
 
 						if (encElement->getTextBreakWidth()) {
-							dc.SetFont(encElement->getDispLabelFont());
+							wxFont theFont = encElement->getDispLabelFont();
+							int pointSize = theFont.GetPointSize();
+							pointSize *= m_FontScale;
+							theFont.SetPointSize(pointSize);
+							dc.SetFont(theFont);
 							dc.SetBackgroundMode(wxTRANSPARENT);
 							dc.SetTextForeground(encElement->getDispLabelColour()->getColor());
 							wxRect textRect(
@@ -370,7 +384,11 @@ void GUIPanelRepresentation::RenderPanel(wxDC& dc) {
 				}
 
 				if (labelElement->getTextBreakWidth() && labelElement->getName() != wxEmptyString) {
-					dc.SetFont(labelElement->getDispLabelFont());
+					wxFont theFont = labelElement->getDispLabelFont();
+					int pointSize = theFont.GetPointSize();
+					pointSize *= m_FontScale;
+					theFont.SetPointSize(pointSize);
+					dc.SetFont(theFont);
 					dc.SetBackgroundMode(wxTRANSPARENT);
 					dc.SetTextForeground(labelElement->getDispLabelColour()->getColor());
 					wxRect textRect(
@@ -709,3 +727,13 @@ void GUIPanelRepresentation::DoUpdateLayout() {
 	UpdateLayout();
 	DoPaintNow();
 }
+
+void GUIPanelRepresentation::InitFont() {
+  wxMemoryDC dc;
+  wxFont font = *wxNORMAL_FONT;
+  wxCoord cx, cy;
+  font.SetPointSize(39);
+  dc.SetFont(font);
+  dc.GetTextExtent(wxT("M"), &cx, &cy);
+  m_FontScale = 62.0 / cy;
+}

src/GUIPanelRepresentation.h

@@ -42,6 +42,7 @@ class GUIPanelRepresentation : public wxDialog {
 	int m_EnclosureY;
 	int m_CenterY;
 	int m_CenterWidth;
+	double m_FontScale;
 
 	wxPoint GetDrawstopPosition(int row, int col);
 	wxPoint GetPushbuttonPosition(int row, int col);
@@ -73,6 +74,7 @@ class GUIPanelRepresentation : public wxDialog {
 	void RenderPanel(wxDC& dc);
 	void TileBitmap(wxRect rect, wxDC& dc, wxBitmap& bitmap, int tileOffsetX, int tileOffsetY);
 	wxString BreakTextLine(wxString text, int textBreakWidth, wxDC& dc);
+	void InitFont();
 
 };