Skip to content

Commit

Permalink
Background lines and print area highlitghthing
Browse files Browse the repository at this point in the history
  • Loading branch information
@yNiklas
yNiklas committed May 13, 2021
1 parent 4d8855e commit d28e7df
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 19 deletions.
15 changes: 9 additions & 6 deletions SyncBoard/MainPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
Height="892"
Width="1500">
<Canvas x:Name="PrintCanvas" Opacity="0"/>
<Grid x:Name="background" Visibility="Collapsed"></Grid>
<Grid x:Name="printBackgrounds"></Grid>
<InkCanvas x:Name="inkCanvas"
Height="1218"
Expand All @@ -38,7 +39,7 @@
</Grid.FocusVisualPrimaryBrush>
<Button Content="Neu" Margin="0,0,23,0" RenderTransformOrigin="0.99,0.473"
HorizontalAlignment="Right" Width="67" Click="Button_Click"/>
<AppBarToggleButton Icon="Accept" Label="Offline-Modus"
<AppBarToggleButton Icon="DisableUpdates" Label="Offline-Modus"
Height="49" Width="98"
x:Name="offlineModeToggleButton"
Checked="offlineModeToggleButton_Checked" Margin="68,0,0,0"/>
Expand All @@ -47,18 +48,20 @@
x:Name="roomCodeBox" TextAlignment="Center" TextChanged="roomCodeBox_TextChanged" HorizontalAlignment="Right" Width="86"/>
<Button Content="Beitreten" Margin="0,0,120,0" RenderTransformOrigin="0.483,0.508" IsEnabled="False"
x:Name="connectButton" Click="connectButton_Click" HorizontalAlignment="Right" Width="76"/>
<Button Content="Exportieren" Margin="313,10,0,0" Click="exportBoard" VerticalAlignment="Top"/>
<Button Content="Laden" Margin="424,10,0,0" Click="importBoard" VerticalAlignment="Top"/>
<Button Content="Exportieren" Margin="402,0,0,0" Click="exportBoard"/>
<Button Content="Laden" Margin="513,0,0,0" Click="importBoard"/>
<TextBlock Margin="0,15,317,0" Text="A User joined your Board" TextWrapping="Wrap"
VerticalAlignment="Top" x:Name="userJoinedText" Visibility="Collapsed" HorizontalAlignment="Right" Width="155"/>
<AppBarToggleButton Icon="Accept" Label="Vollbild"
Width="63"
Click="Button_Click_1" x:Name="fullscreenIcon"/>
<Button Content="Drucken" Margin="505,10,0,0" Click="Printer_Click" VerticalAlignment="Top"/>
<AppBarToggleButton x:Name="togglePrintBackground" Icon="Accept"
<Button Content="Drucken" Margin="594,0,0,0" Click="Printer_Click"/>
<AppBarToggleButton x:Name="togglePrintBackground" Icon="Print"
Label="Druckvorschau" Margin="171,0,0,0"
VerticalAlignment="Center" Width="91" IsChecked="True"
Tapped="TogglePrintSiteBackgrounds"/>
Click="TogglePrintSiteBackgrounds"/>
<AppBarToggleButton x:Name="backgroundToggle" Icon="ViewAll" Label="Kästchen"
Margin="267,0,0,0" Click="ToggleBackgroundLines"/>
</Grid>
<InkToolbar x:Name="inkToolbar"
VerticalAlignment="Top"
Expand Down
83 changes: 72 additions & 11 deletions SyncBoard/MainPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,14 @@ public sealed partial class MainPage : Page
private String roomCode = "";

private static int PAGE_HEIGHT = 1123, PAGE_WIDTH = 794,

PRINT_RECTANGLE_WIDTH = 794,
PRINT_RECTANGLE_HEIGHT = 1123,
AMOUNT_INITIAL_RECTANGLES = 2;
AMOUNT_INITIAL_RECTANGLES = 2,

BACKGROUND_DENSITY_DELTA = 20,

BORDER_EXPANSION = 2000;
private int rectangleCounter = 0;

public MainPage()
Expand Down Expand Up @@ -79,6 +84,7 @@ public MainPage()

// Init background:
InitializePrintSiteBackground();
CreateBackground();

// Network and sync:
InitSocket();
Expand Down Expand Up @@ -413,32 +419,40 @@ private void expandBoard(bool bottom)
{
if (bottom)
{
outputGrid.Height += 1200;
inkCanvas.Height += 1200;
outputGrid.Height += BORDER_EXPANSION;
inkCanvas.Height += BORDER_EXPANSION;
} else
{
outputGrid.Width += 1200;
inkCanvas.Width += 1200;
outputGrid.Width += BORDER_EXPANSION;
inkCanvas.Width += BORDER_EXPANSION;
}

if (inkCanvas.Height >= rectangleCounter * PRINT_RECTANGLE_HEIGHT)
{
CreateNewPrintSiteBackground();
for (int i = 0; i <= ((inkCanvas.Height - rectangleCounter * PRINT_RECTANGLE_HEIGHT) / BORDER_EXPANSION) + 1; i++)
{
CreateNewPrintSiteBackground();
}
}
CreateBackground();
}

private void expandBoard(float offset)
{
outputGrid.Height = offset + 1200;
inkCanvas.Height = offset + 1200;
outputGrid.Height = offset + BORDER_EXPANSION;
inkCanvas.Height = offset + BORDER_EXPANSION;

outputGrid.Width = offset + 1200;
inkCanvas.Width = offset + 1200;
outputGrid.Width = offset + BORDER_EXPANSION;
inkCanvas.Width = offset + BORDER_EXPANSION;

if (inkCanvas.Height >= rectangleCounter * PRINT_RECTANGLE_HEIGHT)
{
CreateNewPrintSiteBackground();
for (int i = 0; i <= ((inkCanvas.Height - rectangleCounter * PRINT_RECTANGLE_HEIGHT) / BORDER_EXPANSION) + 1; i++)
{
CreateNewPrintSiteBackground();
}
}
CreateBackground();
}

private void SetOfflineMode(bool set)
Expand Down Expand Up @@ -714,6 +728,7 @@ private void CreateNewPrintSiteBackground()
rectangle.Width = PRINT_RECTANGLE_WIDTH;
rectangle.Height = PRINT_RECTANGLE_HEIGHT;
rectangle.Margin = new Thickness(0, PRINT_RECTANGLE_HEIGHT * rectangleCounter, 0, 0);
rectangle.Fill = new SolidColorBrush(Color.FromArgb(5, 255, 255, 255));
rectangle.Stroke = new SolidColorBrush(Color.FromArgb(255, 81, 81, 81));
rectangle.VerticalAlignment = VerticalAlignment.Top;
rectangle.HorizontalAlignment = HorizontalAlignment.Left;
Expand All @@ -733,5 +748,51 @@ private void TogglePrintSiteBackgrounds(object sender, RoutedEventArgs e)
printBackgrounds.Visibility = Visibility.Collapsed;
}
}


// Background lines
private void CreateBackground()
{
// Horizontal lines
for (int i = (int)Math.Max(inkCanvas.Height - BORDER_EXPANSION, 0); i <= inkCanvas.Height; i += BACKGROUND_DENSITY_DELTA)
{
Line line = new Line();
line.X1 = (int)Math.Max(inkCanvas.Width - BORDER_EXPANSION, 0);
line.X2 = inkCanvas.Width;
line.Y1 = i;
line.Y2 = i;

line.Stroke = new SolidColorBrush(Color.FromArgb(50, 21, 21, 21));
line.StrokeThickness = 1.0;
background.Children.Add(line);
}

// Vertical lines
for (int i = (int)Math.Max(inkCanvas.Width - BORDER_EXPANSION, 0); i <= inkCanvas.Width; i += BACKGROUND_DENSITY_DELTA)
{
Line line = new Line();
line.X1 = i;
line.X2 = i;
line.Y1 = (int)Math.Max(inkCanvas.Height - BORDER_EXPANSION, 0);
line.Y2 = inkCanvas.Height;

line.Stroke = new SolidColorBrush(Color.FromArgb(50, 21, 21, 21));
line.StrokeThickness = 1.0;
background.Children.Add(line);
}
}

private void ToggleBackgroundLines(object sender, RoutedEventArgs e)
{
if (backgroundToggle.IsChecked == true)
{
background.Visibility = Visibility.Visible;
CreateBackground();
}
else
{
background.Visibility = Visibility.Collapsed;
}
}
}
}
2 changes: 1 addition & 1 deletion SyncBoard/Package.appxmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Identity
Name="932ae293-77fa-4492-9e55-bd1c9a560396"
Publisher="CN=Ypsilon"
Version="1.0.19.0" />
Version="1.0.21.0" />

<mp:PhoneIdentity PhoneProductId="932ae293-77fa-4492-9e55-bd1c9a560396" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

Expand Down
2 changes: 1 addition & 1 deletion SyncBoard/SyncBoard.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
<AppxBundlePlatforms>arm64</AppxBundlePlatforms>
<HoursBetweenUpdateChecks>24</HoursBetweenUpdateChecks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
Expand Down

0 comments on commit d28e7df

Please sign in to comment.