#5436: XYWnd font style is selectable too

codereader · Dec 2, 2020 · 8f1b717 · 8f1b717
1 parent 8889bb4
commit 8f1b717
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/install/user.xml b/install/user.xml
@@ -159,6 +159,7 @@
       <showAxes value="1" />
       <showWorkzone value="0" />
       <fontSize value="14" />
+      <fontStyle value="Sans" />
       <overlay>
         <visible value="0" />
         <transparency value="0.3" />

diff --git a/radiant/xyview/GlobalXYWnd.cpp b/radiant/xyview/GlobalXYWnd.cpp
@@ -46,6 +46,7 @@ namespace
 	const std::string RKEY_DEFAULT_BLOCKSIZE = "user/ui/xyview/defaultBlockSize";
 	const std::string RKEY_TRANSLATE_CONSTRAINED = "user/ui/xyview/translateConstrained";
 	const std::string RKEY_FONT_SIZE = "user/ui/xyview/fontSize";
+	const std::string RKEY_FONT_STYLE = "user/ui/xyview/fontStyle";
 
     const int DEFAULT_CHASE_MOUSE_CAP = 32; // pixels per chase moue timer interval
 }
@@ -199,6 +200,7 @@ void XYWndManager::constructPreferences()
 	page.appendCheckBox(_("Show Workzone"), RKEY_SHOW_WORKZONE);
 	page.appendCheckBox(_("Translate Manipulator always constrained to Axis"), RKEY_TRANSLATE_CONSTRAINED);
 	page.appendCheckBox(_("Higher Selection Priority for Entities"), RKEY_HIGHER_ENTITY_PRIORITY);
+    page.appendCombo(_("Font Style"), RKEY_FONT_STYLE, { "Sans", "Mono" }, true);
     page.appendSpinner(_("Font Size"), RKEY_FONT_SIZE, 4, 48, 0);
 }
 
@@ -218,6 +220,7 @@ void XYWndManager::refreshFromRegistry()
 	_showWorkzone = registry::getValue<bool>(RKEY_SHOW_WORKZONE);
 	_defaultBlockSize = registry::getValue<int>(RKEY_DEFAULT_BLOCKSIZE);
     _fontSize = registry::getValue<int>(RKEY_FONT_SIZE);
+    _fontStyle = registry::getValue<std::string>(RKEY_FONT_STYLE) == "Sans" ? IGLFont::Style::Sans : IGLFont::Style::Mono;
 
 	updateAllViews();
 
@@ -281,6 +284,11 @@ int XYWndManager::fontSize() const
     return _fontSize;
 }
 
+IGLFont::Style XYWndManager::fontStyle() const
+{
+    return _fontStyle;
+}
+
 void XYWndManager::updateAllViews(bool force)
 {
 	for (const XYWndMap::value_type& i : _xyWnds)
@@ -682,6 +690,7 @@ void XYWndManager::initialiseModule(const IApplicationContext& ctx)
 	observeKey(RKEY_SHOW_WORKZONE);
 	observeKey(RKEY_DEFAULT_BLOCKSIZE);
 	observeKey(RKEY_FONT_SIZE);
+	observeKey(RKEY_FONT_STYLE);
 
 	// Trigger loading the values of the observed registry keys
 	refreshFromRegistry();

diff --git a/radiant/xyview/GlobalXYWnd.h b/radiant/xyview/GlobalXYWnd.h
@@ -44,6 +44,7 @@ class XYWndManager :
 
 	unsigned int _defaultBlockSize;
     int _fontSize;
+    IGLFont::Style _fontStyle;
 
 private:
 
@@ -70,6 +71,7 @@ class XYWndManager :
 	bool showWorkzone() const;
 	bool showSizeInfo() const;
 	int fontSize() const;
+    IGLFont::Style fontStyle() const;
 
 	unsigned int defaultBlockSize() const;
 

diff --git a/radiant/xyview/XYWnd.cpp b/radiant/xyview/XYWnd.cpp
@@ -233,7 +233,8 @@ void XYWnd::releaseStates()
 
 void XYWnd::ensureFont()
 {
-    _font = GlobalOpenGL().getFont(IGLFont::Style::Sans, GlobalXYWnd().fontSize());
+    const auto& manager = GlobalXYWnd();
+    _font = GlobalOpenGL().getFont(manager.fontStyle(), manager.fontSize());
 }
 
 const std::string XYWnd::getViewTypeTitle(EViewType viewtype) {