@@ -128,13 +128,6 @@ public bool SpellCheckEnabled
128128 set { spellCheckEnabled = value ; PropertyChanged ? . Invoke ( this , new PropertyChangedEventArgs ( nameof ( SpellCheckEnabled ) ) ) ; }
129129 }
130130
131- private bool sendMessageWithEnterEnabled ;
132- public bool SendMessageWithEnterEnabled
133- {
134- get { return sendMessageWithEnterEnabled ; }
135- set { sendMessageWithEnterEnabled = value ; PropertyChanged ? . Invoke ( this , new PropertyChangedEventArgs ( nameof ( SendMessageWithEnterEnabled ) ) ) ; }
136- }
137-
138131 public Conversation ( )
139132 {
140133 this . InitializeComponent ( ) ;
@@ -217,7 +210,6 @@ public void Load(SignalConversation conversation)
217210 DisposeCurrentThread ( ) ;
218211 UpdateHeader ( conversation ) ;
219212 SpellCheckEnabled = GlobalSettingsManager . SpellCheckSetting ;
220- SendMessageWithEnterEnabled = GlobalSettingsManager . SendMessageWithEnterSetting ;
221213
222214 /*
223215 * When selecting a small (~650 messages) conversation after a bigger (~1800 messages) one,
@@ -312,12 +304,12 @@ public void HandleDeleteMesage(SignalMessage message)
312304
313305 private async void UserInputBar_OnEnterKeyPressed ( )
314306 {
315- CoreWindow corWindow = CoreWindow . GetForCurrentThread ( ) ;
316- bool shift = corWindow . GetKeyState ( VirtualKey . Shift ) . HasFlag ( CoreVirtualKeyStates . Down ) ;
317- bool control = corWindow . GetKeyState ( VirtualKey . Control ) . HasFlag ( CoreVirtualKeyStates . Down ) ;
318- // If SendMessageWithEnterEnabled is true then add new if shift key is pressed.
319- // If SendMessageWithEnterEnabled is false then send message if control key is pressed.
320- if ( SendMessageWithEnterEnabled ? shift : ! control )
307+ CoreWindow coreWindow = CoreWindow . GetForCurrentThread ( ) ;
308+ bool shift = coreWindow . GetKeyState ( VirtualKey . Shift ) . HasFlag ( CoreVirtualKeyStates . Down ) ;
309+ bool control = coreWindow . GetKeyState ( VirtualKey . Control ) . HasFlag ( CoreVirtualKeyStates . Down ) ;
310+ // If SendMessageWithEnterSetting is true then add new if shift key is pressed.
311+ // If SendMessageWithEnterSetting is false then send message if control key is pressed.
312+ if ( GlobalSettingsManager . SendMessageWithEnterSetting ? shift : ! control )
321313 {
322314 UserInputBar . AddLinefeed ( ) ;
323315 }
0 commit comments