jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-09 09:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to latest qcontrolkit

Browse Source
This commit is contained in:
Joel Wetzell
2022-11-06 06:16:16 -06:00
parent 6e80be67ea
commit 811aefcb63
9 changed files with 41 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qController.Standard/Classes/UI/QCueGrid.cs
+10 -9
View File
@@ -3,6 +3,7 @@ using qController.ViewModels;
using QControlKit;
using System.Linq;
using System.Collections.Generic;
using Serilog;
namespace qController.UI
{
@@ -22,6 +23,7 @@ namespace qController.UI
private void BuildGrid(QCue cue)
{
RowDefinitions.Clear();
RowDefinitions.Add(
new RowDefinition
{
@@ -214,19 +216,17 @@ namespace qController.UI
Device.BeginInvokeOnMainThread(() =>
{
//Nuke current grid
List<View> children = Children.ToList();
foreach (View child in children)
{
Children.Remove(child);
}
RowDefinitions = new RowDefinitionCollection();
Children.Clear();
RowDefinitions.Clear();
//rebuild
BuildGrid(qCueViewModel.cue);
//TODO: check if this is working
qCueViewModel.cue.workspace.fetchPlaybackPositionForCue(qCueViewModel.cue);
if (qCueViewModel.cue.IsGroup)
{
qCueViewModel.cue.workspace.fetchPlaybackPositionForCue(qCueViewModel.cue);
}
});
}
@@ -234,7 +234,8 @@ namespace qController.UI
{
if (e.PropertyName.Equals("cues"))
{
ReloadGrid();
//TODO: Figure out why this doesn't work
//ReloadGrid();
}
}
}
qController.Standard/Views/QWorkspacePage.xaml.cs
+19 -6
View File
@@ -111,11 +111,12 @@ namespace qController
selectedCueFrame.BindingContext = new QCueViewModel(selectedCue, false);
//Find cue grid for selected cue and scroll to it if it exists
QCueGrid gridToScrollTo = QCueGridListHelper.get(args.cueID);
if(gridToScrollTo != null)
{
cueListScrollView.ScrollToAsync(gridToScrollTo, ScrollToPosition.Center,true);
}
//TODO: something about element isn't a member
//QCueGrid gridToScrollTo = QCueGridListHelper.get(args.cueID);
//if(gridToScrollTo != null)
//{
// cueListScrollView.ScrollToAsync(gridToScrollTo, ScrollToPosition.Center,true);
//}
}
else
{
@@ -132,6 +133,18 @@ namespace qController
});
}
void updateCuePropertes(QCue cue)
{
cue.workspace.fetchDefaultPropertiesForCue(cue);
if(cue.cues.Count > 0)
{
foreach(QCue childCue in cue.cues)
{
childCue.workspace.fetchDefaultPropertiesForCue(childCue);
}
}
}
void Workspace_WorkspaceUpdated(object source, QWorkspaceUpdatedArgs args)
{
Log.Debug("[workspacepage] Workspace Updated");
@@ -146,7 +159,7 @@ namespace qController
foreach (QCue aCue in connectedWorkspace.cueLists)
{
updateCuePropertes(aCue);
if(aCue.cues.Count > 0)
{
QCueGrid mainCueGrid = new QCueGrid(aCue);
qController.Standard/qController.csproj
+1 -1
View File
@@ -62,7 +62,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="QControlKit" Version="0.0.30" />
<PackageReference Include="QControlKit" Version="0.0.31" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
</ItemGroup>
<ItemGroup>