michele/sledgemapper
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 4 Wiki Activity

fix stash conflicty

Browse source
This commit is contained in:
Michele 2021-02-04 10:02:53 +00:00
parent 5f7d48e149
commit afc94fd698
4 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
Sledgemapper.Api/db/LocalDatabase.db
View file

Binary file not shown.

BIN
Sledgemapper.Api/db/sledgemapper.db
View file

Binary file not shown.

9
Sledgemapper/UI/MainWidget.Generated.cs
View file

@ -1,4 +1,4 @@
/* Generated by MyraPad at 03/02/2021 21:43:01 */ /* Generated by MyraPad at 04/02/2021 10:02:37 */
using Myra; using Myra;
using Myra.Graphics2D; using Myra.Graphics2D;
using Myra.Graphics2D.TextureAtlases; using Myra.Graphics2D.TextureAtlases;
@ -191,6 +191,11 @@ namespace Sledgemapper.UI
}); });
verticalStackPanel1.Widgets.Add(scrollViewer1); verticalStackPanel1.Widgets.Add(scrollViewer1);
TxtOverlaySearch = new TextBox();
TxtOverlaySearch.MinHeight = 40;
TxtOverlaySearch.Margin = new Thickness(0, 4);
TxtOverlaySearch.Id = "TxtOverlaySearch";
GridOverlays = new Grid(); GridOverlays = new Grid();
GridOverlays.ColumnSpacing = 8; GridOverlays.ColumnSpacing = 8;
GridOverlays.RowSpacing = 8; GridOverlays.RowSpacing = 8;
@ -214,6 +219,7 @@ namespace Sledgemapper.UI
{ {
Type = Myra.Graphics2D.UI.ProportionType.Fill, Type = Myra.Graphics2D.UI.ProportionType.Fill,
}); });
verticalStackPanel2.Widgets.Add(TxtOverlaySearch);
verticalStackPanel2.Widgets.Add(scrollViewer2); verticalStackPanel2.Widgets.Add(scrollViewer2);
var verticalSplitPane1 = new VerticalSplitPane(); var verticalSplitPane1 = new VerticalSplitPane();
@ -307,6 +313,7 @@ namespace Sledgemapper.UI
public ImageTextButton BtnToolbarDelete; public ImageTextButton BtnToolbarDelete;
public HorizontalStackPanel Toolbar; public HorizontalStackPanel Toolbar;
public Grid GridWalls; public Grid GridWalls;
public TextBox TxtOverlaySearch;
public Grid GridOverlays; public Grid GridOverlays;
public Label lblConnectionStatus; public Label lblConnectionStatus;
public Label lblUsername; public Label lblUsername;

3
Sledgemapper/UI/mainwidget.xml
View file

@ -56,6 +56,9 @@
<VerticalStackPanel.Proportions> <VerticalStackPanel.Proportions>
<Proportion Type="Fill" /> <Proportion Type="Fill" />
</VerticalStackPanel.Proportions> </VerticalStackPanel.Proportions>
<TextBox MinHeight="40" Margin="0, 4" >
</TextBox>
<ScrollViewer> <ScrollViewer>
<Grid ColumnSpacing="8" RowSpacing="8" Id="GridOverlays"> <Grid ColumnSpacing="8" RowSpacing="8" Id="GridOverlays">
<Grid.DefaultColumnProportion Type="Pixels" Value="40" /> <Grid.DefaultColumnProportion Type="Pixels" Value="40" />