From 2815b6a02eb18c50d2755a7276906f4e02381ee1 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Tue, 11 Oct 2016 13:14:22 +0300
Subject: [PATCH] allow selecting non-monospace fonts - for #12

---
 dub.json                   |  2 +-
 src/dlangide/ui/settings.d | 25 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/dub.json b/dub.json
index 1e03f06..6286d46 100644
--- a/dub.json
+++ b/dub.json
@@ -12,7 +12,7 @@
     "stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi", "views/res/hdpi"],
 
     "dependencies": {
-        "dlangui": "==0.9.7",
+        "dlangui": "==0.9.15",
         "dcd": "~>0.8.0"
     },
 
diff --git a/src/dlangide/ui/settings.d b/src/dlangide/ui/settings.d
index f31aafa..2c5448b 100644
--- a/src/dlangide/ui/settings.d
+++ b/src/dlangide/ui/settings.d
@@ -66,9 +66,28 @@ SettingsPage createSettingsPages() {
     import dlangui.graphics.fonts;
     import std.utf : toUTF32;
     FontFaceProps[] allFaces = FontManager.instance.getFaces();
-    for (int i = 0; i < allFaces.length; i++) {
-        if (allFaces[i].family == FontFamily.MonoSpace)
-            faces ~= StringListValue(allFaces[i].face, toUTF32(allFaces[i].face));
+    import std.algorithm.sorting : sort;
+    auto fontComp = function(ref FontFaceProps a, ref FontFaceProps b) {
+        if (a.family == FontFamily.MonoSpace && b.family != FontFamily.MonoSpace)
+            return -1;
+        if (a.family != FontFamily.MonoSpace && b.family == FontFamily.MonoSpace)
+            return 1;
+        if (a.face < b.face)
+            return -1;
+        if (a.face > b.face)
+            return 1;
+        return 0;
+    };
+    //auto sorted = allFaces.sort!((a, b) => (a.family == FontFamily.MonoSpace && b.family != FontFamily.MonoSpace) || (a.face < b.face));
+    auto sorted = sort!((a, b) => fontComp(a, b) < 0)(allFaces);
+    
+    //allFaces = allFaces.sort!((a, b) => a.family == FontFamily.MonoSpace && b.family == FontFamily.MonoSpace || a.face < b.face);
+    //for (int i = 0; i < allFaces.length; i++) {
+    foreach (face; sorted) {
+        if (face.family == FontFamily.MonoSpace)
+            faces ~= StringListValue(face.face, "*"d ~ toUTF32(face.face));
+        else
+            faces ~= StringListValue(face.face, toUTF32(face.face));
     }
     texted.addStringComboBox("editors/textEditor/fontFace", UIString("Font face"d), faces);