From 66909659a00d9c9618187826567824d3f8f926c7 Mon Sep 17 00:00:00 2001
From: Hand-of-cthulhu <3rdhandofcthulhu@gmail.com>
Date: Mon, 27 Nov 2017 06:35:33 +0000
Subject: [PATCH 1/2] Added option to allow space character to show as icon
---
src/Carnac.Logic/Models/PopupSettings.cs | 1 +
src/Carnac/UI/KeyShowView.xaml | 233 ++++++++++++++---------
src/Carnac/UI/PreferencesView.xaml | 6 +-
3 files changed, 145 insertions(+), 95 deletions(-)
diff --git a/src/Carnac.Logic/Models/PopupSettings.cs b/src/Carnac.Logic/Models/PopupSettings.cs
index 6994e841..f06b5d33 100644
--- a/src/Carnac.Logic/Models/PopupSettings.cs
+++ b/src/Carnac.Logic/Models/PopupSettings.cs
@@ -89,5 +89,6 @@ public string SortDescription
public bool ShowApplicationIcon { get; set; }
public bool SettingsConfigured { get; set; }
public bool ShowOnlyModifiers { get; set; }
+ public bool ShowSpaceAsIcon { get; set; }
}
}
diff --git a/src/Carnac/UI/KeyShowView.xaml b/src/Carnac/UI/KeyShowView.xaml
index 914ce248..4d88e222 100644
--- a/src/Carnac/UI/KeyShowView.xaml
+++ b/src/Carnac/UI/KeyShowView.xaml
@@ -15,7 +15,7 @@
-
+
@@ -24,31 +24,36 @@
-
+
-
+
-
+
-
+
-
+
@@ -72,7 +77,8 @@
Opacity="{Binding DataContext.Settings.ItemOpacity, Source={x:Reference This}}"
IsHitTestVisible="True" Focusable="True" BorderThickness="4" CornerRadius="15" Padding="3">
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ HorizontalAlignment="Stretch" VerticalContentAlignment="Center"
+ ItemsSource="{Binding Text, Mode=OneWay}"
+ FontWeight="Bold" Focusable="False" BorderBrush="{x:Null}"
+ ScrollViewer.HorizontalScrollBarVisibility="Disabled" IsHitTestVisible="False">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Carnac/UI/PreferencesView.xaml b/src/Carnac/UI/PreferencesView.xaml
index 5660dee7..48d11170 100644
--- a/src/Carnac/UI/PreferencesView.xaml
+++ b/src/Carnac/UI/PreferencesView.xaml
@@ -95,7 +95,7 @@
-
+
@@ -140,7 +140,9 @@
ItemsSource="{Binding AvailableColors}"
ItemTemplate="{StaticResource ColourPickerTemplate}" />
-
+
+
+
From 982f3503211203e97be8e538d6ff773147f22486 Mon Sep 17 00:00:00 2001
From: Hand-of-cthulhu <3rdhandofcthulhu@gmail.com>
Date: Mon, 27 Nov 2017 06:45:15 +0000
Subject: [PATCH 2/2] Unformatted code
---
src/Carnac/UI/KeyShowView.xaml | 248 +++++++++++++----------------
src/Carnac/UI/PreferencesView.xaml | 3 +-
2 files changed, 110 insertions(+), 141 deletions(-)
diff --git a/src/Carnac/UI/KeyShowView.xaml b/src/Carnac/UI/KeyShowView.xaml
index 4d88e222..5795e3d5 100644
--- a/src/Carnac/UI/KeyShowView.xaml
+++ b/src/Carnac/UI/KeyShowView.xaml
@@ -15,7 +15,7 @@
-
+
@@ -24,36 +24,31 @@
-
+
-
+
-
+
-
+
-
+
@@ -77,8 +72,7 @@
Opacity="{Binding DataContext.Settings.ItemOpacity, Source={x:Reference This}}"
IsHitTestVisible="True" Focusable="True" BorderThickness="4" CornerRadius="15" Padding="3">
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ HorizontalAlignment="Stretch" VerticalContentAlignment="Center" ItemsSource="{Binding Text, Mode=OneWay}"
+ FontWeight="Bold" Focusable="False" BorderBrush="{x:Null}"
+ ScrollViewer.HorizontalScrollBarVisibility="Disabled" IsHitTestVisible="False">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Carnac/UI/PreferencesView.xaml b/src/Carnac/UI/PreferencesView.xaml
index 48d11170..641f2d3e 100644
--- a/src/Carnac/UI/PreferencesView.xaml
+++ b/src/Carnac/UI/PreferencesView.xaml
@@ -95,7 +95,7 @@
-
+
@@ -140,6 +140,7 @@
ItemsSource="{Binding AvailableColors}"
ItemTemplate="{StaticResource ColourPickerTemplate}" />
+