Prepared load prev msg button (inside active convo view's header, nex…

…t to the convo id).
GlitchedPolygons · Jul 2, 2019 · a1e4f27 · a1e4f27
1 parent fc73860
commit a1e4f27
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 14 deletions.
diff --git a/GlitchedEpistle.Client.Windows/ViewModels/UserControls/ActiveConvoViewModel.cs b/GlitchedEpistle.Client.Windows/ViewModels/UserControls/ActiveConvoViewModel.cs
@@ -1,5 +1,5 @@
 #define PARALLEL_LOAD
-// Comment out the above line to load messages synchronously when opening convos.
+// Comment out the above line to load/decrypt messages synchronously.
 
 using System;
 using System.IO;

diff --git a/GlitchedEpistle.Client.Windows/Views/UserControls/ActiveConvoView.xaml b/GlitchedEpistle.Client.Windows/Views/UserControls/ActiveConvoView.xaml
@@ -55,20 +55,37 @@
                    Height="15"
                    Margin="1,0,0,0"
                    Visibility="{Binding ClipboardTickVisibility}" />
-        </StackPanel>
 
-        <!-- Scroll-to-bottom Button -->
-        <Button Grid.Row="1" 
-                Width="30" 
-                Height="30" 
-                FontSize="20"
-                Margin="0,-35.5,16,0"
-                Style="{DynamicResource ScrollToBottomButton}"
-                ToolTip="Scroll to the bottom of the chat and check out the newest messages."
-                VerticalAlignment="Top" 
-                HorizontalAlignment="Right"
-                Name="ScrollToBottomButton"
-                Click="ScrollToBottomButton_OnClick"/>
+            <!-- Load previous messages Button -->
+            <Button Width="30" 
+                    Height="30" 
+                    FontSize="20"
+                    Margin="0,0,0,0"
+                    Style="{DynamicResource ScrollToBottomButton}"
+                    Command="{Binding LoadPreviousMessagesCommand}"
+                    ToolTip="Load the previous messages that were sent to this convo."
+                    VerticalAlignment="Top" 
+                    HorizontalAlignment="Right"
+                    RenderTransformOrigin="0.5,0.5"
+                    Name="LoadPreviousMessagesButton">
+                <Button.RenderTransform>
+                    <ScaleTransform ScaleY="-1.0" ScaleX="1.0"/>
+                </Button.RenderTransform>
+            </Button>
+
+            <!-- Scroll-to-bottom Button -->
+            <Button Width="30" 
+                    Height="30" 
+                    FontSize="20"
+                    Margin="5,0,0,0"
+                    Style="{DynamicResource ScrollToBottomButton}"
+                    ToolTip="Scroll to the bottom of the chat and check out the newest messages."
+                    VerticalAlignment="Top" 
+                    HorizontalAlignment="Right"
+                    Name="ScrollToBottomButton"
+                    Click="ScrollToBottomButton_OnClick"/>
+
+        </StackPanel>
 
         <!-- Chatroom -->
         <ListBox Grid.Row="1"