diff --git a/Amethyst/DevicesPage.xaml.cpp b/Amethyst/DevicesPage.xaml.cpp index b6ce89ed..71941a14 100644 --- a/Amethyst/DevicesPage.xaml.cpp +++ b/Amethyst/DevicesPage.xaml.cpp @@ -131,14 +131,14 @@ namespace winrt::Amethyst::implementation LOG(INFO) << "Setting the devices' TreeView ItemSource to the created " "Amethyst::DeviceEntryView MVVM object list..."; - devicesTreeView.get()->ItemsSource(box_value(TrackingDevices::deviceMVVM_List)); + devicesTreeView->ItemsSource(box_value(TrackingDevices::deviceMVVM_List)); devices_mvvm_setup_finished = true; // Mark as finished } // Set currently tracking device & selected device LOG(INFO) << "Overwriting the devices TreeView selected item..."; - devicesTreeView.get()->SelectedNode( - devicesTreeView.get()->RootNodes().GetAt(k2app::K2Settings.trackingDeviceGUIDPair.second)); + devicesTreeView->SelectedNode( + devicesTreeView->RootNodes().GetAt(k2app::K2Settings.trackingDeviceGUIDPair.second)); selectedTrackingDeviceGUIDPair = k2app::K2Settings.trackingDeviceGUIDPair; previousSelectedTrackingDeviceGUIDPair = k2app::K2Settings.trackingDeviceGUIDPair; @@ -292,9 +292,9 @@ void Amethyst::implementation::DevicesPage::DeselectDeviceButton_Click( { LOG(INFO) << "Now deselecting the tracking device..."; - setAsOverrideButton.get()->IsEnabled(true); - setAsBaseButton.get()->IsEnabled(true); - deselectDeviceButton.get()->Visibility(Visibility::Collapsed); + setAsOverrideButton->IsEnabled(true); + setAsBaseButton->IsEnabled(true); + deselectDeviceButton->Visibility(Visibility::Collapsed); // Deselect the device k2app::K2Settings.overrideDeviceGUIDsMap.erase( @@ -339,8 +339,8 @@ Windows::Foundation::IAsyncAction Amethyst::implementation::DevicesPage::SetAsOv k2app::interfacing::devices_check_disabled_joints(); /* Update local statuses */ - setAsOverrideButton.get()->IsEnabled(false); - setAsBaseButton.get()->IsEnabled(true); + setAsOverrideButton->IsEnabled(false); + setAsBaseButton->IsEnabled(true); SetDeviceTypeFlyout().Hide(); // Hide the flyout LOG(INFO) << "Changed the current tracking device (Override) to " << @@ -353,12 +353,12 @@ Windows::Foundation::IAsyncAction Amethyst::implementation::DevicesPage::SetAsOv { // Remove the only one child of our outer main content grid // (What a bestiality it is to do that!!1) - devicesOverridesSelectorStackPanelOuter.get()->Children().RemoveAtEnd(); + devicesOverridesSelectorStackPanelOuter->Children().RemoveAtEnd(); Media::Animation::EntranceThemeTransition t; t.IsStaggeringEnabled(true); - devicesOverridesSelectorStackPanelInner.get()->Transitions().Append(t); + devicesOverridesSelectorStackPanelInner->Transitions().Append(t); // Sleep peacefully pretending that noting happened apartment_context ui_thread; @@ -368,8 +368,8 @@ Windows::Foundation::IAsyncAction Amethyst::implementation::DevicesPage::SetAsOv // Re-add the child for it to play our funky transition // (Though it's not the same as before...) - devicesOverridesSelectorStackPanelOuter.get()-> - Children().Append(*devicesOverridesSelectorStackPanelInner); + devicesOverridesSelectorStackPanelOuter->Children().Append( + *devicesOverridesSelectorStackPanelInner); } // Save settings @@ -381,7 +381,7 @@ Windows::Foundation::IAsyncAction Amethyst::implementation::DevicesPage::SetAsOv Sleep(100); co_await ui_thread; - devicesOverridesSelectorStackPanelInner.get()->Transitions().Clear(); + devicesOverridesSelectorStackPanelInner->Transitions().Clear(); } @@ -422,12 +422,12 @@ Windows::Foundation::IAsyncAction Amethyst::implementation::DevicesPage::SetAsBa { // Remove the only one child of our outer main content grid // (What a bestiality it is to do that!!1) - devicesJointsBasisSelectorStackPanelOuter.get()->Children().RemoveAtEnd(); + devicesJointsBasisSelectorStackPanelOuter->Children().RemoveAtEnd(); Media::Animation::EntranceThemeTransition t; t.IsStaggeringEnabled(true); - devicesJointsBasisSelectorStackPanelInner.get()->Transitions().Append(t); + devicesJointsBasisSelectorStackPanelInner->Transitions().Append(t); // Sleep peacefully pretending that noting happened apartment_context ui_thread; @@ -437,7 +437,7 @@ Windows::Foundation::IAsyncAction Amethyst::implementation::DevicesPage::SetAsBa // Re-add the child for it to play our funky transition // (Though it's not the same as before...) - devicesJointsBasisSelectorStackPanelOuter.get()->Children(). + devicesJointsBasisSelectorStackPanelOuter->Children(). Append(*devicesJointsBasisSelectorStackPanelInner); } @@ -450,7 +450,7 @@ Windows::Foundation::IAsyncAction Amethyst::implementation::DevicesPage::SetAsBa Sleep(100); co_await ui_thread; - devicesJointsBasisSelectorStackPanelInner.get()->Transitions().Clear(); + devicesJointsBasisSelectorStackPanelInner->Transitions().Clear(); } @@ -631,7 +631,7 @@ void Amethyst::implementation::DevicesPage::DevicesPage_Loaded_Handler() LOG(INFO) << "Setting the devices' ItemRepeater ItemSource to the created " "Amethyst::PluginEntryView MVVM object list..."; - pluginsItemsRepeater.get()->ItemsSource(box_value(pluginMVVMList)); + pluginsItemsRepeater->ItemsSource(box_value(pluginMVVMList)); } // Reset @@ -925,12 +925,12 @@ k2app::shared::devices::ReloadSelectedDevice( // Collapse all joint expanders if (!_manual) for (const auto& expander : jointSelectorExpanders) - expander.get()->ContainerExpander().get()->IsExpanded(false); + expander->ContainerExpander()->IsExpanded(false); // Collapse all override expanders if (!_manual) for (const auto& expander : overrideSelectorExpanders) - expander.get()->ContainerExpander().get()->IsExpanded(false); + expander->ContainerExpander()->IsExpanded(false); // Check if we've disabled any joints from spawning and disable their mods interfacing::devices_check_disabled_joints(); @@ -947,41 +947,41 @@ k2app::shared::devices::ReloadSelectedDevice( if (TrackingDevices::IsABase(selectedTrackingDeviceGUIDPair.first)) { LOG(INFO) << "Selected a base"; - setAsOverrideButton.get()->IsEnabled(false); - setAsBaseButton.get()->IsEnabled(false); + setAsOverrideButton->IsEnabled(false); + setAsBaseButton->IsEnabled(false); - deselectDeviceButton.get()->Visibility(Visibility::Collapsed); + deselectDeviceButton->Visibility(Visibility::Collapsed); } else if (TrackingDevices::IsAnOverride(selectedTrackingDeviceGUIDPair.first)) { LOG(INFO) << "Selected an override"; - setAsOverrideButton.get()->IsEnabled(false); - setAsBaseButton.get()->IsEnabled(true); + setAsOverrideButton->IsEnabled(false); + setAsBaseButton->IsEnabled(true); - deselectDeviceButton.get()->Visibility(Visibility::Visible); + deselectDeviceButton->Visibility(Visibility::Visible); - if (deviceErrorGrid.get()->Visibility() != Visibility::Visible) + if (deviceErrorGrid->Visibility() != Visibility::Visible) interfacing::currentAppState = L"overrides"; } else { LOG(INFO) << "Selected a [none]"; - setAsOverrideButton.get()->IsEnabled(true); - setAsBaseButton.get()->IsEnabled(true); + setAsOverrideButton->IsEnabled(true); + setAsBaseButton->IsEnabled(true); - deselectDeviceButton.get()->Visibility(Visibility::Collapsed); + deselectDeviceButton->Visibility(Visibility::Collapsed); } if (!_manual) { // Remove the only one child of our outer main content grid // (What a bestiality it is to do that!!1) - devicesMainContentGridOuter.get()->Children().RemoveAtEnd(); + devicesMainContentGridOuter->Children().RemoveAtEnd(); Media::Animation::EntranceThemeTransition t; t.IsStaggeringEnabled(true); - devicesMainContentGridInner.get()->Transitions().Append(t); + devicesMainContentGridInner->Transitions().Append(t); // Sleep peacefully pretending that noting happened apartment_context ui_thread; @@ -991,7 +991,7 @@ k2app::shared::devices::ReloadSelectedDevice( // Re-add the child for it to play our funky transition // (Though it's not the same as before...) - devicesMainContentGridOuter.get()->Children(). + devicesMainContentGridOuter->Children(). Append(*devicesMainContentGridInner); } @@ -1005,7 +1005,7 @@ k2app::shared::devices::ReloadSelectedDevice( Sleep(100); co_await ui_thread; - devicesMainContentGridInner.get()->Transitions().Clear(); + devicesMainContentGridInner->Transitions().Clear(); } void Amethyst::implementation::DevicesPage::PluginManagerFlyout_Opening( diff --git a/Amethyst/GeneralPage.xaml.cpp b/Amethyst/GeneralPage.xaml.cpp index c2edd210..e29e7936 100644 --- a/Amethyst/GeneralPage.xaml.cpp +++ b/Amethyst/GeneralPage.xaml.cpp @@ -19,8 +19,8 @@ std::wstring general_calibrating_device_guid; void skeleton_visibility_set_ui(const bool& v) { if (!general_tab_setup_finished)return; // Don't even care if we're not set up yet - skeletonToggleButton.get()->IsChecked(v); - skeletonToggleButton.get()->Content(box_value(v + skeletonToggleButton->IsChecked(v); + skeletonToggleButton->Content(box_value(v ? box_value( k2app::interfacing::LocalizedResourceWString( L"GeneralPage", @@ -30,14 +30,14 @@ void skeleton_visibility_set_ui(const bool& v) L"GeneralPage", L"Buttons/Skeleton/Show")))); - forceRenderCheckBox.get()->IsEnabled(v); - forceRenderText.get()->Opacity(v ? 1.0 : 0.5); + forceRenderCheckBox->IsEnabled(v); + forceRenderText->Opacity(v ? 1.0 : 0.5); } void skeleton_force_set_ui(const bool& v) { if (!general_tab_setup_finished)return; // Don't even care if we're not set up yet - forceRenderCheckBox.get()->IsChecked(v); + forceRenderCheckBox->IsChecked(v); } std::wstring points_format(std::wstring fmt, @@ -113,8 +113,8 @@ namespace winrt::Amethyst::implementation // Create and push the offsets controller offsetsController = std::move(std::make_shared()); - offsetsControlHostGrid.get()->Children().Append(*offsetsController->Container()); - offsetsControlHostGrid.get()->SetRow(*offsetsController->Container(), 0); + offsetsControlHostGrid->Children().Append(*offsetsController->Container()); + offsetsControlHostGrid->SetRow(*offsetsController->Container(), 0); offsetsController->ReAppendTrackerPivots(); @@ -178,9 +178,9 @@ void Amethyst::implementation::GeneralPage::SkeletonToggleButton_Click( const Controls::SplitButtonClickEventArgs& e) { if (!general_tab_setup_finished)return; // Don't even care if we're not set up yet - k2app::K2Settings.skeletonPreviewEnabled = skeletonToggleButton.get()->IsChecked(); + k2app::K2Settings.skeletonPreviewEnabled = skeletonToggleButton->IsChecked(); - skeletonToggleButton.get()->Content( + skeletonToggleButton->Content( k2app::K2Settings.skeletonPreviewEnabled ? box_value(k2app::interfacing::LocalizedResourceWString( L"GeneralPage", L"Buttons/Skeleton/Hide")) @@ -192,10 +192,10 @@ void Amethyst::implementation::GeneralPage::SkeletonToggleButton_Click( ? k2app::interfacing::sounds::AppSounds::ToggleOn : k2app::interfacing::sounds::AppSounds::ToggleOff); - forceRenderCheckBox.get()->IsEnabled( - skeletonToggleButton.get()->IsChecked()); - forceRenderText.get()->Opacity( - skeletonToggleButton.get()->IsChecked() ? 1.0 : 0.5); + forceRenderCheckBox->IsEnabled( + skeletonToggleButton->IsChecked()); + forceRenderText->Opacity( + skeletonToggleButton->IsChecked() ? 1.0 : 0.5); k2app::K2Settings.saveSettings(); } @@ -1035,7 +1035,7 @@ void Amethyst::implementation::GeneralPage::GeneralPage_Loaded_Handler() // Update the internal version if (versionLabel.get() != nullptr) - versionLabel.get()->Text( + versionLabel->Text( L"v" + StringToWString(k2app::interfacing::K2InternalVersion)); // Try auto-spawning trackers if stated so @@ -1090,8 +1090,8 @@ void Amethyst::implementation::GeneralPage::GeneralPage_Loaded_Handler() skeleton_force_set_ui(k2app::K2Settings.forceSkeletonPreview); // Setup the freeze button - toggleFreezeButton.get()->IsChecked(k2app::interfacing::isTrackingFrozen); - toggleFreezeButton.get()->Content(k2app::interfacing::isTrackingFrozen + toggleFreezeButton->IsChecked(k2app::interfacing::isTrackingFrozen); + toggleFreezeButton->Content(k2app::interfacing::isTrackingFrozen ? box_value( k2app::interfacing::LocalizedResourceWString( L"GeneralPage", @@ -1104,16 +1104,16 @@ void Amethyst::implementation::GeneralPage::GeneralPage_Loaded_Handler() // Set up the co/re/disconnect button if (!k2app::interfacing::K2AppTrackersSpawned) { - toggleTrackersButton.get()->Content(box_value( + toggleTrackersButton->Content(box_value( k2app::interfacing::LocalizedResourceWString( L"GeneralPage", L"Buttons/TrackersToggle/Connect"))); - toggleTrackersButton.get()->IsChecked(false); + toggleTrackersButton->IsChecked(false); } else { - toggleTrackersButton.get()->IsChecked(k2app::interfacing::K2AppTrackersInitialized); - toggleTrackersButton.get()->Content(k2app::interfacing::K2AppTrackersInitialized + toggleTrackersButton->IsChecked(k2app::interfacing::K2AppTrackersInitialized); + toggleTrackersButton->Content(k2app::interfacing::K2AppTrackersInitialized ? box_value( k2app::interfacing::LocalizedResourceWString( L"GeneralPage", @@ -1324,7 +1324,7 @@ void Amethyst::implementation::GeneralPage::SkeletonDrawingCanvas_Loaded( if (isCurrentWindowActive_backup != isCurrentWindowActive && k2app::shared::main::appTitleLabel.get() != nullptr) { - k2app::shared::main::appTitleLabel.get()->Opacity(isCurrentWindowActive ? 1.0 : 0.5); + k2app::shared::main::appTitleLabel->Opacity(isCurrentWindowActive ? 1.0 : 0.5); isCurrentWindowActive_backup = isCurrentWindowActive; } @@ -1860,8 +1860,8 @@ void Amethyst::implementation::GeneralPage::ToggleTrackingButton_Click( { k2app::interfacing::isTrackingFrozen = !k2app::interfacing::isTrackingFrozen; - toggleFreezeButton.get()->IsChecked(k2app::interfacing::isTrackingFrozen); - toggleFreezeButton.get()->Content( + toggleFreezeButton->IsChecked(k2app::interfacing::isTrackingFrozen); + toggleFreezeButton->Content( k2app::interfacing::isTrackingFrozen ? box_value( k2app::interfacing::LocalizedResourceWString( diff --git a/Amethyst/InfoPage.xaml.cpp b/Amethyst/InfoPage.xaml.cpp index 825ce64b..a1b4f4a3 100644 --- a/Amethyst/InfoPage.xaml.cpp +++ b/Amethyst/InfoPage.xaml.cpp @@ -53,7 +53,7 @@ namespace winrt::Amethyst::implementation // Play a sound playAppSound(k2app::interfacing::sounds::AppSounds::Show); - k2app::shared::main::consoleItem.get()->Visibility(Visibility::Visible); + k2app::shared::main::consoleItem->Visibility(Visibility::Visible); } } diff --git a/Amethyst/JointExpander.h b/Amethyst/JointExpander.h index 1aaa0e1b..99fd4a95 100644 --- a/Amethyst/JointExpander.h +++ b/Amethyst/JointExpander.h @@ -125,31 +125,31 @@ namespace TrackingDevices if (isExternalFlipSupportable() && k2app::K2Settings.isFlipEnabled && k2app::K2Settings.isExternalFlipEnabled) { - k2app::shared::settings::externalFlipStatusLabel.get()->Text( + k2app::shared::settings::externalFlipStatusLabel->Text( k2app::interfacing::LocalizedResourceWString( L"SettingsPage", L"Captions/ExtFlipStatus/Active")); - k2app::shared::settings::externalFlipStatusStackPanel.get()->Visibility( + k2app::shared::settings::externalFlipStatusStackPanel->Visibility( winrt::Microsoft::UI::Xaml::Visibility::Visible); } // No tracker detected else if (k2app::K2Settings.isExternalFlipEnabled) { - k2app::shared::settings::externalFlipStatusLabel.get()->Text( + k2app::shared::settings::externalFlipStatusLabel->Text( k2app::interfacing::LocalizedResourceWString( L"SettingsPage", L"Captions/ExtFlipStatus/NoTracker")); - k2app::shared::settings::externalFlipStatusStackPanel.get()->Visibility( + k2app::shared::settings::externalFlipStatusStackPanel->Visibility( winrt::Microsoft::UI::Xaml::Visibility::Visible); } // Disabled by the user else { - k2app::shared::settings::externalFlipStatusLabel.get()->Text( + k2app::shared::settings::externalFlipStatusLabel->Text( k2app::interfacing::LocalizedResourceWString( L"SettingsPage", L"Captions/ExtFlipStatus/Disabled")); - k2app::shared::settings::externalFlipStatusStackPanel.get()->Visibility( + k2app::shared::settings::externalFlipStatusStackPanel->Visibility( winrt::Microsoft::UI::Xaml::Visibility::Collapsed); } } @@ -165,11 +165,11 @@ namespace TrackingDevices // Flip if (!k2app::K2Settings.isFlipEnabled) { - k2app::shared::settings::flipDropDown.get()->IsEnabled(false); - k2app::shared::settings::flipDropDown.get()->IsExpanded(false); + k2app::shared::settings::flipDropDown->IsEnabled(false); + k2app::shared::settings::flipDropDown->IsExpanded(false); } else - k2app::shared::settings::flipDropDown.get()->IsEnabled(true); + k2app::shared::settings::flipDropDown->IsEnabled(true); } inline void settings_trackersConfigChanged(const bool& showToasts = true) @@ -184,7 +184,7 @@ namespace TrackingDevices if (k2app::interfacing::K2AppTrackersSpawned) { if (k2app::shared::settings::restartButton.get() != nullptr && showToasts) - if (!k2app::shared::settings::restartButton.get()->IsEnabled()) + if (!k2app::shared::settings::restartButton->IsEnabled()) { k2app::interfacing::ShowToast( k2app::interfacing::LocalizedResourceWString( @@ -202,7 +202,7 @@ namespace TrackingDevices // Compare with saved settings and unlock the restart if (k2app::shared::settings::restartButton.get() != nullptr) - k2app::shared::settings::restartButton.get()->IsEnabled(true); + k2app::shared::settings::restartButton->IsEnabled(true); } // Enable/Disable combos @@ -332,7 +332,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls // by the switch's toggle handler void UpdateIsActive() { - _ptr_joint_switch.get()->IsOn( + _ptr_joint_switch->IsOn( _tracker_pointers[0]->data_isActive); if (!_tracker_pointers[0]->data_isActive) @@ -389,8 +389,8 @@ namespace winrt::Microsoft::UI::Xaml::Controls if (_tracker_pointers[0]->base_tracker == ktvr::ITrackerType::Tracker_LeftFoot || _tracker_pointers[0]->base_tracker == ktvr::ITrackerType::Tracker_RightFoot) { - _ptr_software_orientation.get()->IsEnabled(enable); - _ptr_software_orientation_v2.get()->IsEnabled(enable); + _ptr_software_orientation->IsEnabled(enable); + _ptr_software_orientation_v2->IsEnabled(enable); // Reset if selected and was turned off for (const auto& tracker_p : _tracker_pointers) @@ -399,7 +399,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls tracker_p->orientationTrackingOption == k2app::k2_SoftwareCalculatedRotation_V2)) { tracker_p->orientationTrackingOption = k2app::k2_DeviceInferredRotation; - _ptr_orientation_combo.get()->SelectedIndex(k2app::k2_DeviceInferredRotation); + _ptr_orientation_combo->SelectedIndex(k2app::k2_DeviceInferredRotation); } } } @@ -658,7 +658,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls for (const auto& expander : k2app::shared::settings::jointExpanderVector) if (expander->MainExpander().get() != nullptr && expander->MainExpander().get() != _ptr_main_expander.get()) - expander->MainExpander().get()->IsExpanded(false); + expander->MainExpander()->IsExpanded(false); for (const auto& tracker_p : _tracker_pointers) tracker_p->data_isActive = _tracker_pointers[0]->data_isActive; @@ -682,7 +682,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls // Make actual changes for (const auto& tracker_p : _tracker_pointers) { - tracker_p->data_isActive = _ptr_joint_switch.get()->IsOn(); + tracker_p->data_isActive = _ptr_joint_switch->IsOn(); // Do that on UI's background apartment_context _ui_thread; @@ -719,7 +719,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls k2app::K2Settings.saveSettings(); // Play a sound - playAppSound(_ptr_joint_switch.get()->IsOn() + playAppSound(_ptr_joint_switch->IsOn() ? k2app::interfacing::sounds::AppSounds::ToggleOn : k2app::interfacing::sounds::AppSounds::ToggleOff); @@ -735,7 +735,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls LOG(WARNING) << "All trackers have been disabled, force-enabling the waist tracker!"; // Enable the wiast tracker (no need to worry about the dispatcher, we're already inside) - k2app::shared::settings::jointExpanderVector.front()->JointSwitch().get()->IsOn(true); + k2app::shared::settings::jointExpanderVector.front()->JointSwitch()->IsOn(true); // Save settings k2app::K2Settings.saveSettings(); @@ -753,12 +753,12 @@ namespace winrt::Microsoft::UI::Xaml::Controls // Don't react to pre-init signals if (!k2app::shared::settings::settings_localInitFinished)return; - if (_ptr_position_combo.get()->SelectedIndex() < 0) - _ptr_position_combo.get()->SelectedItem(e.RemovedItems().GetAt(0)); + if (_ptr_position_combo->SelectedIndex() < 0) + _ptr_position_combo->SelectedItem(e.RemovedItems().GetAt(0)); for (const auto& tracker_p : _tracker_pointers) tracker_p->positionTrackingFilterOption = - static_cast(_ptr_position_combo.get()->SelectedIndex()); + static_cast(_ptr_position_combo->SelectedIndex()); // Save settings k2app::K2Settings.saveSettings(); @@ -783,12 +783,12 @@ namespace winrt::Microsoft::UI::Xaml::Controls // Don't react to pre-init signals if (!k2app::shared::settings::settings_localInitFinished)return; - if (_ptr_orientation_combo.get()->SelectedIndex() < 0) - _ptr_orientation_combo.get()->SelectedItem(e.RemovedItems().GetAt(0)); + if (_ptr_orientation_combo->SelectedIndex() < 0) + _ptr_orientation_combo->SelectedItem(e.RemovedItems().GetAt(0)); for (const auto& tracker_p : _tracker_pointers) tracker_p->orientationTrackingOption = - static_cast(_ptr_orientation_combo.get()-> + static_cast(_ptr_orientation_combo-> SelectedIndex()); // Save settings @@ -810,8 +810,8 @@ namespace winrt::Microsoft::UI::Xaml::Controls if (_tracker_pointers[0]->base_tracker == ktvr::ITrackerType::Tracker_LeftFoot || _tracker_pointers[0]->base_tracker == ktvr::ITrackerType::Tracker_RightFoot) { - _ptr_software_orientation.get()->Visibility(Visibility::Visible); - _ptr_software_orientation_v2.get()->Visibility(Visibility::Visible); + _ptr_software_orientation->Visibility(Visibility::Visible); + _ptr_software_orientation_v2->Visibility(Visibility::Visible); } _ptr_main_expander->Expanding([&](const auto&, const auto&) diff --git a/Amethyst/JointSelectorExpander.h b/Amethyst/JointSelectorExpander.h index b2af49d3..1f256712 100644 --- a/Amethyst/JointSelectorExpander.h +++ b/Amethyst/JointSelectorExpander.h @@ -57,7 +57,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_container_panel.get()->Children().Clear(); + _ptr_container_panel->Children().Clear(); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -77,7 +77,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_container_panel.get()->Children().Append(*_ptr_header); + _ptr_container_panel->Children().Append(*_ptr_header); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -102,7 +102,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_container_panel.get()->Children().Append(*_row->Container()); + _ptr_container_panel->Children().Append(*_row->Container()); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -291,17 +291,17 @@ namespace winrt::Microsoft::UI::Xaml::Controls _ptr_header = std::make_shared(_header); // Set up some signals - _ptr_container_expander.get()->Expanding( + _ptr_container_expander->Expanding( [this](const Expander& sender, const ExpanderExpandingEventArgs& e) -> void { for (auto& expander : k2app::shared::devices::jointSelectorExpanders) - if (expander.get()->ContainerExpander().get() != nullptr && - expander.get()->ContainerExpander().get() != _ptr_container_expander.get()) - expander.get()->ContainerExpander().get()->IsExpanded(false); + if (expander->ContainerExpander().get() != nullptr && + expander->ContainerExpander().get() != _ptr_container_expander.get()) + expander->ContainerExpander()->IsExpanded(false); }); - _ptr_container_expander.get()->Expanding([&](const auto&, const auto&) + _ptr_container_expander->Expanding([&](const auto&, const auto&) { // Don't react to pre-init signals if (!k2app::shared::devices::devices_tab_setup_finished)return; @@ -310,7 +310,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls playAppSound(k2app::interfacing::sounds::AppSounds::Show); }); - _ptr_container_expander.get()->Collapsed([&](const auto&, const auto&) + _ptr_container_expander->Collapsed([&](const auto&, const auto&) { // Don't react to pre-init signals if (!k2app::shared::devices::devices_tab_setup_finished)return; diff --git a/Amethyst/JointSelectorRow.h b/Amethyst/JointSelectorRow.h index 3f8f7a53..b03c7c41 100644 --- a/Amethyst/JointSelectorRow.h +++ b/Amethyst/JointSelectorRow.h @@ -57,7 +57,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_tracker_combo.get()->Items().Clear(); + _ptr_tracker_combo->Items().Clear(); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -80,7 +80,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_tracker_combo.get()->Items().Append( + _ptr_tracker_combo->Items().Append( box_value(_joint.getJointName())); }(); } @@ -96,7 +96,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls // Check base IDs if wrong TrackingDevices::devices_check_base_ids(); - _ptr_tracker_combo.get()->SelectedIndex(_tracker_pointer->selectedTrackedJointID); + _ptr_tracker_combo->SelectedIndex(_tracker_pointer->selectedTrackedJointID); const bool _overriden_from_other_device = (_tracker_pointer->isPositionOverridden || _tracker_pointer->isRotationOverridden) && @@ -238,10 +238,10 @@ namespace winrt::Microsoft::UI::Xaml::Controls k2app::shared::devices::devices_joints_setup_pending) return; - if (_ptr_tracker_combo.get()->SelectedIndex() >= 0) - _tracker_pointer->selectedTrackedJointID = _ptr_tracker_combo.get()->SelectedIndex(); + if (_ptr_tracker_combo->SelectedIndex() >= 0) + _tracker_pointer->selectedTrackedJointID = _ptr_tracker_combo->SelectedIndex(); else - _ptr_tracker_combo.get()->SelectedItem(e.RemovedItems().GetAt(0)); + _ptr_tracker_combo->SelectedItem(e.RemovedItems().GetAt(0)); // If we're using a joints device then also signal the joint const auto& trackingDevice = TrackingDevices::getCurrentDevice(); diff --git a/Amethyst/K2Interfacing.h b/Amethyst/K2Interfacing.h index ac2607b4..ae989de7 100644 --- a/Amethyst/K2Interfacing.h +++ b/Amethyst/K2Interfacing.h @@ -187,7 +187,7 @@ namespace k2app::interfacing toast.Priority(static_cast< winrt::Microsoft::Windows::AppNotifications::AppNotificationPriority>(high_priority)); - shared::main::thisNotificationManager.get()->Show(toast); + shared::main::thisNotificationManager->Show(toast); } inline void ProcessToastArguments(const winrt::Microsoft::Windows:: @@ -944,7 +944,7 @@ namespace k2app::interfacing co_await ui_thread; if (shared::general::errorWhatText.get() != nullptr && - shared::general::errorWhatText.get()->Visibility() == + shared::general::errorWhatText->Visibility() == winrt::Microsoft::UI::Xaml::Visibility::Visible) playAppSound(sounds::AppSounds::Error); }); @@ -1073,37 +1073,37 @@ namespace k2app::interfacing // Disable UI (partially) if we've encountered an error if (shared::main::devicesItem.get() != nullptr) { - //::k2app::shared::main::settingsItem.get()->IsEnabled(isServerDriverPresent); - shared::main::devicesItem.get()->IsEnabled(isServerDriverPresent); + //::k2app::shared::main::settingsItem->IsEnabled(isServerDriverPresent); + shared::main::devicesItem->IsEnabled(isServerDriverPresent); } // Check with this one, should be the same for all anyway if (shared::general::serverErrorWhatText.get() != nullptr) { - shared::general::serverErrorWhatText.get()->Visibility( + shared::general::serverErrorWhatText->Visibility( isServerDriverPresent ? Visibility::Collapsed : Visibility::Visible); - shared::general::serverErrorWhatGrid.get()->Visibility( + shared::general::serverErrorWhatGrid->Visibility( isServerDriverPresent ? Visibility::Collapsed : Visibility::Visible); - shared::general::serverErrorButtonsGrid.get()->Visibility( + shared::general::serverErrorButtonsGrid->Visibility( isServerDriverPresent ? Visibility::Collapsed : Visibility::Visible); - shared::general::serverErrorLabel.get()->Visibility( + shared::general::serverErrorLabel->Visibility( isServerDriverPresent ? Visibility::Collapsed : Visibility::Visible); // Split status and message by \n - shared::general::serverStatusLabel.get()->Text( + shared::general::serverStatusLabel->Text( split_status(serverStatusString)[0]); - shared::general::serverErrorLabel.get()->Text( + shared::general::serverErrorLabel->Text( split_status(serverStatusString)[1]); - shared::general::serverErrorWhatText.get()->Text( + shared::general::serverErrorWhatText->Text( split_status(serverStatusString)[2]); // Optionally setup & show the reregister button - shared::general::reRegisterButton.get()->Visibility( + shared::general::reRegisterButton->Visibility( serverDriverStatusCode == -10 ? Visibility::Visible : Visibility::Collapsed); - shared::general::serverOpenDiscordButton.get()->Height( + shared::general::serverOpenDiscordButton->Height( serverDriverStatusCode == -10 ? 40 : 65); @@ -1120,16 +1120,16 @@ namespace k2app::interfacing LOG(INFO) << "[Server Error] Entering the server error state..."; // Hide device error labels (if any) - shared::general::errorWhatText.get()->Visibility(Visibility::Collapsed); - shared::general::errorWhatGrid.get()->Visibility(Visibility::Collapsed); - shared::general::errorButtonsGrid.get()->Visibility(Visibility::Collapsed); - shared::general::trackingDeviceErrorLabel.get()->Visibility( + shared::general::errorWhatText->Visibility(Visibility::Collapsed); + shared::general::errorWhatGrid->Visibility(Visibility::Collapsed); + shared::general::errorButtonsGrid->Visibility(Visibility::Collapsed); + shared::general::trackingDeviceErrorLabel->Visibility( Visibility::Collapsed); // Block spawn|offsets|calibration buttons, //disable autospawn for session (just don't save) - shared::general::toggleTrackersButton.get()->IsEnabled(false); - shared::general::calibrationButton.get()->IsEnabled(false); - shared::general::offsetsButton.get()->IsEnabled(false); + shared::general::toggleTrackersButton->IsEnabled(false); + shared::general::calibrationButton->IsEnabled(false); + shared::general::offsetsButton->IsEnabled(false); //::k2app::K2Settings.autoSpawnEnabledJoints = false; } } @@ -1604,7 +1604,7 @@ namespace k2app::interfacing bool Visibility() override { if (_ptr_text_block.get()) - return (_ptr_text_block.get()->Visibility() + return (_ptr_text_block->Visibility() == Visibility::Visible); return true; } @@ -1616,7 +1616,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_text_block.get()) - _ptr_text_block.get()->Visibility( + _ptr_text_block->Visibility( visibility ? Visibility::Visible : Visibility::Collapsed); @@ -1627,7 +1627,7 @@ namespace k2app::interfacing bool IsPrimary() override { if (_ptr_text_block.get()) - return (_ptr_text_block.get()->Opacity() == 1.0); + return (_ptr_text_block->Opacity() == 1.0); return true; } @@ -1639,7 +1639,7 @@ namespace k2app::interfacing if (isExitingNow)return; if (_ptr_text_block.get()) { - _ptr_text_block.get()->Opacity( + _ptr_text_block->Opacity( primary ? 1.0 : 0.5); } }); @@ -1649,7 +1649,7 @@ namespace k2app::interfacing uint32_t Width() override { if (_ptr_text_block.get()) - return _ptr_text_block.get()->Width(); + return _ptr_text_block->Width(); return 0; } @@ -1660,7 +1660,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_text_block.get()) - _ptr_text_block.get()->Width(width); + _ptr_text_block->Width(width); }); } @@ -1668,7 +1668,7 @@ namespace k2app::interfacing uint32_t Height() override { if (_ptr_text_block.get()) - return _ptr_text_block.get()->Height(); + return _ptr_text_block->Height(); return 0; } @@ -1679,7 +1679,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_text_block.get()) - _ptr_text_block.get()->Height(height); + _ptr_text_block->Height(height); }); } @@ -1687,7 +1687,7 @@ namespace k2app::interfacing std::wstring Text() override { if (_ptr_text_block.get()) - return _ptr_text_block.get()->Text().c_str(); + return _ptr_text_block->Text().c_str(); return L""; } @@ -1698,7 +1698,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_text_block.get()) - _ptr_text_block.get()->Text(text); + _ptr_text_block->Text(text); }); } @@ -1738,7 +1738,7 @@ namespace k2app::interfacing bool Visibility() override { if (_ptr_button.get()) - return (_ptr_button.get()->Visibility() + return (_ptr_button->Visibility() == Visibility::Visible); return true; } @@ -1750,7 +1750,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_button.get()) - _ptr_button.get()->Visibility( + _ptr_button->Visibility( visibility ? Visibility::Visible : Visibility::Collapsed); @@ -1761,7 +1761,7 @@ namespace k2app::interfacing uint32_t Width() override { if (_ptr_button.get()) - return _ptr_button.get()->Width(); + return _ptr_button->Width(); return 0; } @@ -1772,7 +1772,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_button.get()) - _ptr_button.get()->Width(width); + _ptr_button->Width(width); }); } @@ -1780,7 +1780,7 @@ namespace k2app::interfacing uint32_t Height() override { if (_ptr_button.get()) - return _ptr_button.get()->Height(); + return _ptr_button->Height(); return 0; } @@ -1791,7 +1791,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_button.get()) - _ptr_button.get()->Height(height); + _ptr_button->Height(height); }); } @@ -1799,7 +1799,7 @@ namespace k2app::interfacing bool IsEnabled() override { if (_ptr_button.get()) - return _ptr_button.get()->IsEnabled(); + return _ptr_button->IsEnabled(); return true; } @@ -1810,7 +1810,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_button.get()) - _ptr_button.get()->IsEnabled(enabled); + _ptr_button->IsEnabled(enabled); }); } @@ -1822,7 +1822,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_button.get()) - _ptr_button.get()->Content( + _ptr_button->Content( winrt::box_value(content)); }); } @@ -1885,7 +1885,7 @@ namespace k2app::interfacing bool Visibility() override { if (_ptr_number_box.get()) - return (_ptr_number_box.get()->Visibility() + return (_ptr_number_box->Visibility() == Visibility::Visible); return true; } @@ -1897,7 +1897,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_number_box.get()) - _ptr_number_box.get()->Visibility( + _ptr_number_box->Visibility( visibility ? Visibility::Visible : Visibility::Collapsed); @@ -1908,7 +1908,7 @@ namespace k2app::interfacing uint32_t Width() override { if (_ptr_number_box.get()) - return _ptr_number_box.get()->Width(); + return _ptr_number_box->Width(); return 0; } @@ -1919,7 +1919,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_number_box.get()) - _ptr_number_box.get()->Width(width); + _ptr_number_box->Width(width); }); } @@ -1927,7 +1927,7 @@ namespace k2app::interfacing uint32_t Height() override { if (_ptr_number_box.get()) - return _ptr_number_box.get()->Height(); + return _ptr_number_box->Height(); return 0; } @@ -1938,7 +1938,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_number_box.get()) - _ptr_number_box.get()->Height(height); + _ptr_number_box->Height(height); }); } @@ -1946,7 +1946,7 @@ namespace k2app::interfacing bool IsEnabled() override { if (_ptr_number_box.get()) - return _ptr_number_box.get()->IsEnabled(); + return _ptr_number_box->IsEnabled(); return true; } @@ -1957,7 +1957,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_number_box.get()) - _ptr_number_box.get()->IsEnabled(enabled); + _ptr_number_box->IsEnabled(enabled); }); } @@ -1965,7 +1965,7 @@ namespace k2app::interfacing int Value() override { if (_ptr_number_box.get()) - return static_cast(_ptr_number_box.get()->Value()); + return static_cast(_ptr_number_box->Value()); return 0; } @@ -1976,7 +1976,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_number_box.get()) - _ptr_number_box.get()->Value(value); + _ptr_number_box->Value(value); }); } @@ -2042,7 +2042,7 @@ namespace k2app::interfacing bool Visibility() override { if (_ptr_combo_box.get()) - return (_ptr_combo_box.get()->Visibility() + return (_ptr_combo_box->Visibility() == Visibility::Visible); return true; } @@ -2054,7 +2054,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_combo_box.get()) - _ptr_combo_box.get()->Visibility( + _ptr_combo_box->Visibility( visibility ? Visibility::Visible : Visibility::Collapsed); @@ -2065,7 +2065,7 @@ namespace k2app::interfacing uint32_t Width() override { if (_ptr_combo_box.get()) - return _ptr_combo_box.get()->Width(); + return _ptr_combo_box->Width(); return 0; } @@ -2076,7 +2076,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_combo_box.get()) - _ptr_combo_box.get()->Width(width); + _ptr_combo_box->Width(width); }); } @@ -2084,7 +2084,7 @@ namespace k2app::interfacing uint32_t Height() override { if (_ptr_combo_box.get()) - return _ptr_combo_box.get()->Height(); + return _ptr_combo_box->Height(); return 0; } @@ -2095,7 +2095,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_combo_box.get()) - _ptr_combo_box.get()->Height(height); + _ptr_combo_box->Height(height); }); } @@ -2103,7 +2103,7 @@ namespace k2app::interfacing bool IsEnabled() override { if (_ptr_combo_box.get()) - return _ptr_combo_box.get()->IsEnabled(); + return _ptr_combo_box->IsEnabled(); return true; } @@ -2114,7 +2114,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_combo_box.get()) - _ptr_combo_box.get()->IsEnabled(enabled); + _ptr_combo_box->IsEnabled(enabled); }); } @@ -2122,7 +2122,7 @@ namespace k2app::interfacing uint32_t SelectedIndex() override { if (_ptr_combo_box.get()) - return _ptr_combo_box.get()->SelectedIndex(); + return _ptr_combo_box->SelectedIndex(); return 0; } @@ -2133,8 +2133,8 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_combo_box.get() && - _ptr_combo_box.get()->Items().Size() < value) - _ptr_combo_box.get()->SelectedIndex(value); + _ptr_combo_box->Items().Size() < value) + _ptr_combo_box->SelectedIndex(value); }); } @@ -2146,7 +2146,7 @@ namespace k2app::interfacing std::vector _items; // Construct a funny vector - for (auto e : _ptr_combo_box.get()->Items()) + for (auto e : _ptr_combo_box->Items()) _items.push_back(e.as().c_str()); return _items; @@ -2164,16 +2164,16 @@ namespace k2app::interfacing if (_ptr_combo_box.get()) { // Boiler start - reset selection to a safe spot - _ptr_combo_box.get()->SelectedIndex(0); + _ptr_combo_box->SelectedIndex(0); // Clear items and append the new ones - _ptr_combo_box.get()->Items().Clear(); + _ptr_combo_box->Items().Clear(); for (const auto& str : entries) - _ptr_combo_box.get()->Items().Append( + _ptr_combo_box->Items().Append( winrt::box_value(str)); // Boiler end - reset selection to the start - _ptr_combo_box.get()->SelectedIndex(0); + _ptr_combo_box->SelectedIndex(0); } }); } @@ -2211,7 +2211,7 @@ namespace k2app::interfacing void { if (OnSelectionChanged) // Check if not null - OnSelectionChanged(this, _ptr_combo_box.get()->SelectedIndex()); + OnSelectionChanged(this, _ptr_combo_box->SelectedIndex()); }; // Set up the click handler to point to the base's one @@ -2245,7 +2245,7 @@ namespace k2app::interfacing bool Visibility() override { if (_ptr_check_box.get()) - return (_ptr_check_box.get()->Visibility() + return (_ptr_check_box->Visibility() == Visibility::Visible); return true; } @@ -2257,7 +2257,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_check_box.get()) - _ptr_check_box.get()->Visibility( + _ptr_check_box->Visibility( visibility ? Visibility::Visible : Visibility::Collapsed); @@ -2268,7 +2268,7 @@ namespace k2app::interfacing uint32_t Width() override { if (_ptr_check_box.get()) - return _ptr_check_box.get()->Width(); + return _ptr_check_box->Width(); return 0; } @@ -2279,7 +2279,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_check_box.get()) - _ptr_check_box.get()->Width(width); + _ptr_check_box->Width(width); }); } @@ -2287,7 +2287,7 @@ namespace k2app::interfacing uint32_t Height() override { if (_ptr_check_box.get()) - return _ptr_check_box.get()->Height(); + return _ptr_check_box->Height(); return 0; } @@ -2298,7 +2298,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_check_box.get()) - _ptr_check_box.get()->Height(height); + _ptr_check_box->Height(height); }); } @@ -2306,7 +2306,7 @@ namespace k2app::interfacing bool IsEnabled() override { if (_ptr_check_box.get()) - return _ptr_check_box.get()->IsEnabled(); + return _ptr_check_box->IsEnabled(); return true; } @@ -2317,7 +2317,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_check_box.get()) - _ptr_check_box.get()->IsEnabled(enabled); + _ptr_check_box->IsEnabled(enabled); }); } @@ -2325,7 +2325,7 @@ namespace k2app::interfacing bool IsChecked() override { if (_ptr_check_box.get()) - return _ptr_check_box.get()->IsChecked().Value(); + return _ptr_check_box->IsChecked().Value(); return false; } @@ -2336,7 +2336,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_check_box.get()) - _ptr_check_box.get()->IsChecked(is_checked); + _ptr_check_box->IsChecked(is_checked); }); } @@ -2405,7 +2405,7 @@ namespace k2app::interfacing bool Visibility() override { if (_ptr_toggle_switch.get()) - return (_ptr_toggle_switch.get()->Visibility() + return (_ptr_toggle_switch->Visibility() == Visibility::Visible); return true; } @@ -2417,7 +2417,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_toggle_switch.get()) - _ptr_toggle_switch.get()->Visibility( + _ptr_toggle_switch->Visibility( visibility ? Visibility::Visible : Visibility::Collapsed); @@ -2428,7 +2428,7 @@ namespace k2app::interfacing uint32_t Width() override { if (_ptr_toggle_switch.get()) - return _ptr_toggle_switch.get()->Width(); + return _ptr_toggle_switch->Width(); return 0; } @@ -2439,7 +2439,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_toggle_switch.get()) - _ptr_toggle_switch.get()->Width(width); + _ptr_toggle_switch->Width(width); }); } @@ -2447,7 +2447,7 @@ namespace k2app::interfacing uint32_t Height() override { if (_ptr_toggle_switch.get()) - return _ptr_toggle_switch.get()->Height(); + return _ptr_toggle_switch->Height(); return 0; } @@ -2458,7 +2458,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_toggle_switch.get()) - _ptr_toggle_switch.get()->Height(height); + _ptr_toggle_switch->Height(height); }); } @@ -2466,7 +2466,7 @@ namespace k2app::interfacing bool IsEnabled() override { if (_ptr_toggle_switch.get()) - return _ptr_toggle_switch.get()->IsEnabled(); + return _ptr_toggle_switch->IsEnabled(); return true; } @@ -2477,7 +2477,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_toggle_switch.get()) - _ptr_toggle_switch.get()->IsEnabled(enabled); + _ptr_toggle_switch->IsEnabled(enabled); }); } @@ -2485,7 +2485,7 @@ namespace k2app::interfacing bool IsChecked() override { if (_ptr_toggle_switch.get()) - return _ptr_toggle_switch.get()->IsOn(); + return _ptr_toggle_switch->IsOn(); return false; } @@ -2496,7 +2496,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_toggle_switch.get()) - _ptr_toggle_switch.get()->IsOn(is_checked); + _ptr_toggle_switch->IsOn(is_checked); }); } @@ -2528,7 +2528,7 @@ namespace k2app::interfacing void { // Check which handler to raise - if (this->Get().get()->IsOn()) + if (this->Get()->IsOn()) { if (OnChecked) // Check if not null OnChecked(this); @@ -2565,7 +2565,7 @@ namespace k2app::interfacing bool Visibility() override { if (_ptr_text_box.get()) - return (_ptr_text_box.get()->Visibility() + return (_ptr_text_box->Visibility() == Visibility::Visible); return true; } @@ -2577,7 +2577,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_text_box.get()) - _ptr_text_box.get()->Visibility( + _ptr_text_box->Visibility( visibility ? Visibility::Visible : Visibility::Collapsed); @@ -2588,7 +2588,7 @@ namespace k2app::interfacing uint32_t Width() override { if (_ptr_text_box.get()) - return _ptr_text_box.get()->Width(); + return _ptr_text_box->Width(); return 0; } @@ -2599,7 +2599,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_text_box.get()) - _ptr_text_box.get()->Width(width); + _ptr_text_box->Width(width); }); } @@ -2607,7 +2607,7 @@ namespace k2app::interfacing uint32_t Height() override { if (_ptr_text_box.get()) - return _ptr_text_box.get()->Height(); + return _ptr_text_box->Height(); return 0; } @@ -2618,7 +2618,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_text_box.get()) - _ptr_text_box.get()->Height(height); + _ptr_text_box->Height(height); }); } @@ -2626,7 +2626,7 @@ namespace k2app::interfacing std::wstring Text() override { if (_ptr_text_box.get()) - return _ptr_text_box.get()->Text().c_str(); + return _ptr_text_box->Text().c_str(); return L""; } @@ -2637,7 +2637,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_text_box.get()) - _ptr_text_box.get()->Text(text); + _ptr_text_box->Text(text); }); } @@ -2698,7 +2698,7 @@ namespace k2app::interfacing bool Visibility() override { if (_ptr_progress_ring.get()) - return (_ptr_progress_ring.get()->Visibility() + return (_ptr_progress_ring->Visibility() == Visibility::Visible); return true; } @@ -2710,7 +2710,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_progress_ring.get()) - _ptr_progress_ring.get()->Visibility( + _ptr_progress_ring->Visibility( visibility ? Visibility::Visible : Visibility::Collapsed); @@ -2721,7 +2721,7 @@ namespace k2app::interfacing uint32_t Width() override { if (_ptr_progress_ring.get()) - return _ptr_progress_ring.get()->Width(); + return _ptr_progress_ring->Width(); return 0; } @@ -2732,7 +2732,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_progress_ring.get()) - _ptr_progress_ring.get()->Width(width); + _ptr_progress_ring->Width(width); }); } @@ -2740,7 +2740,7 @@ namespace k2app::interfacing uint32_t Height() override { if (_ptr_progress_ring.get()) - return _ptr_progress_ring.get()->Height(); + return _ptr_progress_ring->Height(); return 0; } @@ -2751,7 +2751,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_progress_ring.get()) - _ptr_progress_ring.get()->Height(height); + _ptr_progress_ring->Height(height); }); } @@ -2760,9 +2760,9 @@ namespace k2app::interfacing { if (_ptr_progress_ring.get()) { - if (_ptr_progress_ring.get()->IsIndeterminate()) + if (_ptr_progress_ring->IsIndeterminate()) return -1; - return _ptr_progress_ring.get()->Value(); + return _ptr_progress_ring->Value(); } return -1; } @@ -2777,13 +2777,13 @@ namespace k2app::interfacing { if (progress < 0) { - _ptr_progress_ring.get()->IsActive(true); - _ptr_progress_ring.get()->IsIndeterminate(true); + _ptr_progress_ring->IsActive(true); + _ptr_progress_ring->IsIndeterminate(true); } else { - _ptr_progress_ring.get()->Value(progress); - _ptr_progress_ring.get()->IsIndeterminate(false); + _ptr_progress_ring->Value(progress); + _ptr_progress_ring->IsIndeterminate(false); } } }); @@ -2841,7 +2841,7 @@ namespace k2app::interfacing bool Visibility() override { if (_ptr_progress_bar.get()) - return (_ptr_progress_bar.get()->Visibility() + return (_ptr_progress_bar->Visibility() == Visibility::Visible); return true; } @@ -2853,7 +2853,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_progress_bar.get()) - _ptr_progress_bar.get()->Visibility( + _ptr_progress_bar->Visibility( visibility ? Visibility::Visible : Visibility::Collapsed); @@ -2864,7 +2864,7 @@ namespace k2app::interfacing uint32_t Width() override { if (_ptr_progress_bar.get()) - return _ptr_progress_bar.get()->Width(); + return _ptr_progress_bar->Width(); return 0; } @@ -2875,7 +2875,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_progress_bar.get()) - _ptr_progress_bar.get()->Width(width); + _ptr_progress_bar->Width(width); }); } @@ -2883,7 +2883,7 @@ namespace k2app::interfacing uint32_t Height() override { if (_ptr_progress_bar.get()) - return _ptr_progress_bar.get()->Height(); + return _ptr_progress_bar->Height(); return 0; } @@ -2894,7 +2894,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_progress_bar.get()) - _ptr_progress_bar.get()->Height(height); + _ptr_progress_bar->Height(height); }); } @@ -2903,9 +2903,9 @@ namespace k2app::interfacing { if (_ptr_progress_bar.get()) { - if (_ptr_progress_bar.get()->IsIndeterminate()) + if (_ptr_progress_bar->IsIndeterminate()) return -1; - return _ptr_progress_bar.get()->Value(); + return _ptr_progress_bar->Value(); } return -1; } @@ -2920,12 +2920,12 @@ namespace k2app::interfacing { if (progress < 0) { - _ptr_progress_bar.get()->IsIndeterminate(true); + _ptr_progress_bar->IsIndeterminate(true); } else { - _ptr_progress_bar.get()->Value(progress); - _ptr_progress_bar.get()->IsIndeterminate(false); + _ptr_progress_bar->Value(progress); + _ptr_progress_bar->IsIndeterminate(false); } } }); @@ -2935,7 +2935,7 @@ namespace k2app::interfacing bool ShowPaused() override { if (_ptr_progress_bar.get()) - return _ptr_progress_bar.get()->ShowPaused(); + return _ptr_progress_bar->ShowPaused(); return false; } @@ -2946,7 +2946,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_progress_bar.get()) - _ptr_progress_bar.get()->ShowPaused(show_paused); + _ptr_progress_bar->ShowPaused(show_paused); }); } @@ -2954,7 +2954,7 @@ namespace k2app::interfacing bool ShowError() override { if (_ptr_progress_bar.get()) - return _ptr_progress_bar.get()->ShowError(); + return _ptr_progress_bar->ShowError(); return false; } @@ -2965,7 +2965,7 @@ namespace k2app::interfacing { if (isExitingNow)return; if (_ptr_progress_bar.get()) - _ptr_progress_bar.get()->ShowError(show_error); + _ptr_progress_bar->ShowError(show_error); }); } @@ -3042,17 +3042,17 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( horizontalAlignmentConverter(alignment)); - (*pElement).Get().get()->TextWrapping(TextWrapping::WrapWholeWords); + (*pElement).Get()->TextWrapping(TextWrapping::WrapWholeWords); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - _ptr_stack_panel.get()->Children().Append(*(*pElement).Get()); + _ptr_stack_panel->Children().Append(*(*pElement).Get()); return; } @@ -3061,19 +3061,19 @@ namespace k2app::interfacing { const auto& pElement = static_cast(std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( horizontalAlignmentConverter(alignment)); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - (*pElement).Get().get()->Padding({10, 7, 10, 7}); + (*pElement).Get()->Padding({10, 7, 10, 7}); - (*pElement).Get().get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); + (*pElement).Get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); - _ptr_stack_panel.get()->Children().Append(*(*pElement).Get()); + _ptr_stack_panel->Children().Append(*(*pElement).Get()); return; } @@ -3083,15 +3083,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( horizontalAlignmentConverter(alignment)); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - _ptr_stack_panel.get()->Children().Append(*(*pElement).Get()); + _ptr_stack_panel->Children().Append(*(*pElement).Get()); return; } @@ -3101,15 +3101,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( horizontalAlignmentConverter(alignment)); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - _ptr_stack_panel.get()->Children().Append(*(*pElement).Get()); + _ptr_stack_panel->Children().Append(*(*pElement).Get()); return; } @@ -3119,15 +3119,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( horizontalAlignmentConverter(alignment)); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - _ptr_stack_panel.get()->Children().Append(*(*pElement).Get()); + _ptr_stack_panel->Children().Append(*(*pElement).Get()); return; } @@ -3137,15 +3137,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( horizontalAlignmentConverter(alignment)); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - _ptr_stack_panel.get()->Children().Append(*(*pElement).Get()); + _ptr_stack_panel->Children().Append(*(*pElement).Get()); return; } @@ -3155,15 +3155,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( horizontalAlignmentConverter(alignment)); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - _ptr_stack_panel.get()->Children().Append(*(*pElement).Get()); + _ptr_stack_panel->Children().Append(*(*pElement).Get()); return; } @@ -3173,15 +3173,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( horizontalAlignmentConverter(alignment)); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - _ptr_stack_panel.get()->Children().Append(*(*pElement).Get()); + _ptr_stack_panel->Children().Append(*(*pElement).Get()); return; } @@ -3191,15 +3191,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( horizontalAlignmentConverter(alignment)); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - _ptr_stack_panel.get()->Children().Append(*(*pElement).Get()); + _ptr_stack_panel->Children().Append(*(*pElement).Get()); } } } @@ -3226,15 +3226,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->TextWrapping(TextWrapping::WrapWholeWords); + (*pElement).Get()->TextWrapping(TextWrapping::WrapWholeWords); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 0); @@ -3247,17 +3247,17 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - (*pElement).Get().get()->Padding({10, 7, 10, 7}); + (*pElement).Get()->Padding({10, 7, 10, 7}); - (*pElement).Get().get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); + (*pElement).Get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 0); @@ -3270,13 +3270,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 0); @@ -3289,13 +3289,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 0); @@ -3308,13 +3308,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 0); @@ -3327,13 +3327,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 0); @@ -3346,13 +3346,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 0); @@ -3365,13 +3365,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 0); @@ -3384,13 +3384,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 0); @@ -3411,15 +3411,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->TextWrapping(TextWrapping::WrapWholeWords); + (*pElement).Get()->TextWrapping(TextWrapping::WrapWholeWords); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 1); @@ -3432,17 +3432,17 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - (*pElement).Get().get()->Padding({10, 7, 10, 7}); + (*pElement).Get()->Padding({10, 7, 10, 7}); - (*pElement).Get().get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); + (*pElement).Get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 1); @@ -3455,13 +3455,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 1); @@ -3474,13 +3474,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 1); @@ -3493,13 +3493,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 1); @@ -3512,13 +3512,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 1); @@ -3531,13 +3531,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 1); @@ -3550,13 +3550,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 1); @@ -3569,13 +3569,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), 1); @@ -3586,7 +3586,7 @@ namespace k2app::interfacing } // Append the created grid to the base stack - _ptr_stack_panel.get()->Children().Append(_grid); + _ptr_stack_panel->Children().Append(_grid); } // Append a One-Row element pair : */* column space @@ -3609,15 +3609,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->TextWrapping(TextWrapping::WrapWholeWords); + (*pElement).Get()->TextWrapping(TextWrapping::WrapWholeWords); - (*pElement).Get().get()->Margin({3, 3, 5, 3}); + (*pElement).Get()->Margin({3, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3628,17 +3628,17 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 5, 3}); + (*pElement).Get()->Margin({3, 3, 5, 3}); - (*pElement).Get().get()->Padding({10, 7, 10, 7}); + (*pElement).Get()->Padding({10, 7, 10, 7}); - (*pElement).Get().get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); + (*pElement).Get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3649,13 +3649,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 5, 3}); + (*pElement).Get()->Margin({3, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3666,13 +3666,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 5, 3}); + (*pElement).Get()->Margin({3, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3683,13 +3683,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 5, 3}); + (*pElement).Get()->Margin({3, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3700,13 +3700,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 5, 3}); + (*pElement).Get()->Margin({3, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3717,13 +3717,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 5, 3}); + (*pElement).Get()->Margin({3, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3734,13 +3734,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 5, 3}); + (*pElement).Get()->Margin({3, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3751,13 +3751,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(first_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Left); - (*pElement).Get().get()->Margin({3, 3, 5, 3}); + (*pElement).Get()->Margin({3, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3776,15 +3776,15 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->TextWrapping(TextWrapping::WrapWholeWords); + (*pElement).Get()->TextWrapping(TextWrapping::WrapWholeWords); - (*pElement).Get().get()->Margin({5, 3, 5, 3}); + (*pElement).Get()->Margin({5, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3795,17 +3795,17 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({5, 3, 5, 3}); + (*pElement).Get()->Margin({5, 3, 5, 3}); - (*pElement).Get().get()->Padding({10, 7, 10, 7}); + (*pElement).Get()->Padding({10, 7, 10, 7}); - (*pElement).Get().get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); + (*pElement).Get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3816,13 +3816,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({5, 3, 5, 3}); + (*pElement).Get()->Margin({5, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3833,13 +3833,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({5, 3, 5, 3}); + (*pElement).Get()->Margin({5, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3850,13 +3850,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({5, 3, 5, 3}); + (*pElement).Get()->Margin({5, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3867,13 +3867,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({5, 3, 5, 3}); + (*pElement).Get()->Margin({5, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3884,13 +3884,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({5, 3, 5, 3}); + (*pElement).Get()->Margin({5, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3901,13 +3901,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({5, 3, 5, 3}); + (*pElement).Get()->Margin({5, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3918,13 +3918,13 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(second_element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment( + (*pElement).Get()->HorizontalAlignment( HorizontalAlignment::Right); - (*pElement).Get().get()->Margin({5, 3, 5, 3}); + (*pElement).Get()->Margin({5, 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -3933,7 +3933,7 @@ namespace k2app::interfacing } // Append the created grid to the base stack - _ptr_stack_panel.get()->Children().Append(_stack_panel); + _ptr_stack_panel->Children().Append(_stack_panel); } // Append a One-Row element vector : */*/.../* column space @@ -3973,14 +3973,14 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment(_alignment); + (*pElement).Get()->HorizontalAlignment(_alignment); - (*pElement).Get().get()->TextWrapping(TextWrapping::WrapWholeWords); + (*pElement).Get()->TextWrapping(TextWrapping::WrapWholeWords); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), i); @@ -3993,16 +3993,16 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment(_alignment); + (*pElement).Get()->HorizontalAlignment(_alignment); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); - (*pElement).Get().get()->Padding({10, 7, 10, 7}); + (*pElement).Get()->Padding({10, 7, 10, 7}); - (*pElement).Get().get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); + (*pElement).Get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), i); @@ -4015,12 +4015,12 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment(_alignment); + (*pElement).Get()->HorizontalAlignment(_alignment); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), i); @@ -4033,12 +4033,12 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment(_alignment); + (*pElement).Get()->HorizontalAlignment(_alignment); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), i); @@ -4051,12 +4051,12 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment(_alignment); + (*pElement).Get()->HorizontalAlignment(_alignment); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), i); @@ -4069,12 +4069,12 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment(_alignment); + (*pElement).Get()->HorizontalAlignment(_alignment); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), i); @@ -4087,12 +4087,12 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment(_alignment); + (*pElement).Get()->HorizontalAlignment(_alignment); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), i); @@ -4105,12 +4105,12 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment(_alignment); + (*pElement).Get()->HorizontalAlignment(_alignment); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), i); @@ -4123,12 +4123,12 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->HorizontalAlignment(_alignment); + (*pElement).Get()->HorizontalAlignment(_alignment); - (*pElement).Get().get()->Margin({3, 3, 3, 3}); + (*pElement).Get()->Margin({3, 3, 3, 3}); _grid.Children().Append(*(*pElement).Get()); _grid.SetColumn(*(*pElement).Get(), i); @@ -4139,7 +4139,7 @@ namespace k2app::interfacing } // Append the created grid to the base stack - _ptr_stack_panel.get()->Children().Append(_grid); + _ptr_stack_panel->Children().Append(_grid); } @@ -4165,12 +4165,12 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->TextWrapping(TextWrapping::WrapWholeWords); + (*pElement).Get()->TextWrapping(TextWrapping::WrapWholeWords); - (*pElement).Get().get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); + (*pElement).Get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -4181,14 +4181,14 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); + (*pElement).Get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); - (*pElement).Get().get()->Padding({10, 7, 10, 7}); + (*pElement).Get()->Padding({10, 7, 10, 7}); - (*pElement).Get().get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); + (*pElement).Get()->FontWeight(winrt::Windows::UI::Text::FontWeights::SemiBold()); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -4199,10 +4199,10 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); + (*pElement).Get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -4213,10 +4213,10 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); + (*pElement).Get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -4227,10 +4227,10 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); + (*pElement).Get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -4241,10 +4241,10 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); + (*pElement).Get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -4255,10 +4255,10 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); + (*pElement).Get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -4269,10 +4269,10 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); + (*pElement).Get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -4283,10 +4283,10 @@ namespace k2app::interfacing const auto& pElement = static_cast( std::get(element)); - (*pElement).Get().get()->VerticalAlignment( + (*pElement).Get()->VerticalAlignment( VerticalAlignment::Center); - (*pElement).Get().get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); + (*pElement).Get()->Margin({(i == 0 ? 3. : 5.), 3, 5, 3}); _stack_panel.Children().Append(*(*pElement).Get()); break; @@ -4295,7 +4295,7 @@ namespace k2app::interfacing } // Append the created grid to the base stack - _ptr_stack_panel.get()->Children().Append(_stack_panel); + _ptr_stack_panel->Children().Append(_stack_panel); } // Creation: register a host diff --git a/Amethyst/K2Main.h b/Amethyst/K2Main.h index 64179136..751b4706 100644 --- a/Amethyst/K2Main.h +++ b/Amethyst/K2Main.h @@ -36,13 +36,13 @@ namespace k2app::main // Play a Sound and Update UI playAppSound(isTrackingFrozen ? sounds::AppSounds::ToggleOff : sounds::AppSounds::ToggleOn); - shared::main::thisDispatcherQueue.get()->TryEnqueue([&] + shared::main::thisDispatcherQueue->TryEnqueue([&] { if (shared::general::toggleFreezeButton.get() != nullptr) { shared::general::general_tab_setup_finished = false; // Boiler - shared::general::toggleFreezeButton.get()->IsChecked(isTrackingFrozen); - shared::general::toggleFreezeButton.get()->Content(isTrackingFrozen + shared::general::toggleFreezeButton->IsChecked(isTrackingFrozen); + shared::general::toggleFreezeButton->Content(isTrackingFrozen ? winrt::box_value( LocalizedResourceWString( L"GeneralPage", @@ -132,12 +132,12 @@ namespace k2app::main ? sounds::AppSounds::ToggleOn : sounds::AppSounds::ToggleOff); - shared::main::thisDispatcherQueue.get()->TryEnqueue([&] + shared::main::thisDispatcherQueue->TryEnqueue([&] { if (shared::settings::flipToggle.get() != nullptr) { shared::settings::settings_localInitFinished = false; // Boiler - shared::settings::flipToggle.get()->IsOn(K2Settings.isFlipEnabled); + shared::settings::flipToggle->IsOn(K2Settings.isFlipEnabled); shared::settings::settings_localInitFinished = true; // Boiler end } }); @@ -487,7 +487,7 @@ namespace k2app::main // Run the worker (if applicable) if (K2Settings.checkForOverlappingTrackers && !interfacing::isAlreadyAddedTrackersScanRunning) - shared::main::thisDispatcherQueue.get()->TryEnqueue( + shared::main::thisDispatcherQueue->TryEnqueue( [&]()-> winrt::Windows::Foundation::IAsyncAction { using namespace winrt; @@ -1119,7 +1119,7 @@ namespace k2app::main _refresh_running = true; // Parse the request - update - shared::main::thisDispatcherQueue.get()->TryEnqueue([&] + shared::main::thisDispatcherQueue->TryEnqueue([&] { interfacing::statusUIRefreshRequested = false; interfacing::statusUIRefreshRequested_Urgent = false; @@ -1130,7 +1130,7 @@ namespace k2app::main { TrackingDevices::devices_handle_refresh(false); - if (shared::devices::deviceErrorGrid.get()->Visibility() == + if (shared::devices::deviceErrorGrid->Visibility() == winrt::Microsoft::UI::Xaml::Visibility::Visible) interfacing::statusUIRefreshRequested = true; // Redo } @@ -1138,7 +1138,7 @@ namespace k2app::main { TrackingDevices::updateTrackingDevicesUI(); - if (shared::general::errorWhatGrid.get()->Visibility() == + if (shared::general::errorWhatGrid->Visibility() == winrt::Microsoft::UI::Xaml::Visibility::Visible) interfacing::statusUIRefreshRequested = true; // Redo } diff --git a/Amethyst/MainWindow.xaml.cpp b/Amethyst/MainWindow.xaml.cpp index 3f575182..91d4254f 100644 --- a/Amethyst/MainWindow.xaml.cpp +++ b/Amethyst/MainWindow.xaml.cpp @@ -828,7 +828,7 @@ namespace winrt::Amethyst::implementation std::make_shared(AppNotificationManager::Default()); LOG(INFO) << "Registering the notification manager..."; - k2app::shared::main::thisNotificationManager.get()->Register(); + k2app::shared::main::thisNotificationManager->Register(); } LOG(INFO) << "Creating and registering the default resource manager..."; @@ -839,7 +839,7 @@ namespace winrt::Amethyst::implementation LOG(INFO) << "Creating and registering the default resource context..."; k2app::shared::main::thisResourceContext = std::make_shared( - k2app::shared::main::thisResourceManager.get()->CreateResourceContext()); + k2app::shared::main::thisResourceManager->CreateResourceContext()); LOG(INFO) << "Pushing control pages to window..."; k2app::shared::main::m_pages.push_back({L"general", winrt::xaml_typename()}); @@ -1000,10 +1000,10 @@ namespace winrt::Amethyst::implementation } // Cleanup event handler - k2app::shared::main::thisNotificationManager.get()->NotificationInvoked(notification_token); + k2app::shared::main::thisNotificationManager->NotificationInvoked(notification_token); // Call Unregister() before exiting main so that subsequent invocations will launch a new process - k2app::shared::main::thisNotificationManager.get()->Unregister(); + k2app::shared::main::thisNotificationManager->Unregister(); // Flush the log cleaner google::FlushLogFiles(google::GLOG_INFO); @@ -1533,7 +1533,7 @@ namespace winrt::Amethyst::implementation _guid = pDevice_GUID; // Create a layout root for the device and override - k2app::shared::main::thisDispatcherQueue.get()->TryEnqueue( + k2app::shared::main::thisDispatcherQueue->TryEnqueue( [_last_device_index, this] { LOG(INFO) << "Registering device[" << _last_device_index << @@ -1775,7 +1775,7 @@ namespace winrt::Amethyst::implementation _guid = pDevice_GUID; // Create a layout root for the device and override - k2app::shared::main::thisDispatcherQueue.get()->TryEnqueue( + k2app::shared::main::thisDispatcherQueue->TryEnqueue( [_last_device_index, this] { LOG(INFO) << "Registering device[" << _last_device_index << @@ -2172,7 +2172,7 @@ namespace winrt::Amethyst::implementation }).detach(); // Update the UI - k2app::shared::main::thisDispatcherQueue.get()->TryEnqueue([&, this] + k2app::shared::main::thisDispatcherQueue->TryEnqueue([&, this] { TrackingDevices::updateTrackingDevicesUI(); }); @@ -2968,7 +2968,7 @@ void Amethyst::implementation::MainWindow::HelpFlyoutDocsButton_Click( k2app::shared::main::NavView_Navigate(L"general", Media::Animation::EntranceNavigationTransitionInfo()); // Hide the okashi tab - k2app::shared::main::consoleItem.get()->Visibility(Visibility::Collapsed); + k2app::shared::main::consoleItem->Visibility(Visibility::Collapsed); } } diff --git a/Amethyst/OffsetsController.h b/Amethyst/OffsetsController.h index f6da65ed..4465291a 100644 --- a/Amethyst/OffsetsController.h +++ b/Amethyst/OffsetsController.h @@ -41,7 +41,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls void ReReadOffsets() { for (const auto& _item : _offsetsPivotItems) - _item.get()->ReReadOffsets(); // NumberBoxes are guarded inside anyway + _item->ReReadOffsets(); // NumberBoxes are guarded inside anyway } void ReAppendTrackerPivots() @@ -56,7 +56,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_container.get()->Items().Clear(); + _ptr_container->Items().Clear(); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -80,7 +80,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_container.get()->Items().Append(*(_item)->Container()); + _ptr_container->Items().Append(*(_item)->Container()); }(); } __except (EXCEPTION_EXECUTE_HANDLER) diff --git a/Amethyst/OffsetsPivotItem.h b/Amethyst/OffsetsPivotItem.h index 7356a525..fe983e0e 100644 --- a/Amethyst/OffsetsPivotItem.h +++ b/Amethyst/OffsetsPivotItem.h @@ -33,7 +33,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls {{0, 2}, {1, 1}, {2, 0}}; // Update backend offsets with new values DO NOT SAVE - _ptr_orientation_control_boxes[index].get()->Value( + _ptr_orientation_control_boxes[index]->Value( static_cast(round(radiansToDegrees( _tracker_pointer->orientationOffset(_xyz_zyx_map[index]))))); } @@ -42,7 +42,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls for (uint32_t index = 0; index < 3; index++) { // XYZ - _ptr_position_control_boxes[index].get()->Value( + _ptr_position_control_boxes[index]->Value( static_cast(_tracker_pointer->positionOffset[index] * 100.0)); } @@ -278,7 +278,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls for (uint32_t index = 0; index < 3; index++) { // ZYX - _ptr_orientation_control_boxes[index].get()->ValueChanged( + _ptr_orientation_control_boxes[index]->ValueChanged( [index, this](const winrt::Windows::Foundation::IInspectable& sender, const NumberBoxValueChangedEventArgs& e) -> void { @@ -312,7 +312,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls for (uint32_t index = 0; index < 3; index++) { // XYZ - _ptr_position_control_boxes[index].get()->ValueChanged( + _ptr_position_control_boxes[index]->ValueChanged( [index, this](const winrt::Windows::Foundation::IInspectable& sender, const NumberBoxValueChangedEventArgs& e) -> void { diff --git a/Amethyst/OverrideSelectorExpander.h b/Amethyst/OverrideSelectorExpander.h index e725bb89..1428d919 100644 --- a/Amethyst/OverrideSelectorExpander.h +++ b/Amethyst/OverrideSelectorExpander.h @@ -56,7 +56,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls __DEVICES_JOINTS_BEGIN_CHANGES for (const auto& _row : _overrideSelectorRows) - _row.get()->ClearOverrideCombos(); + _row->ClearOverrideCombos(); __DEVICES_JOINTS_END_CHANGES } @@ -66,7 +66,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls __DEVICES_JOINTS_BEGIN_CHANGES for (const auto& _row : _overrideSelectorRows) - _row.get()->SelectOverrideJoints(); + _row->SelectOverrideJoints(); __DEVICES_JOINTS_END_CHANGES } @@ -76,7 +76,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls __DEVICES_JOINTS_BEGIN_CHANGES for (const auto& _row : _overrideSelectorRows) - _row.get()->UpdateOverrideJoints(all); + _row->UpdateOverrideJoints(all); __DEVICES_JOINTS_END_CHANGES } @@ -86,7 +86,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls __DEVICES_JOINTS_BEGIN_CHANGES for (const auto& _row : _overrideSelectorRows) - _row.get()->UpdateOverrideJoints(_string, secondary); + _row->UpdateOverrideJoints(_string, secondary); __DEVICES_JOINTS_END_CHANGES } @@ -96,7 +96,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls __DEVICES_JOINTS_BEGIN_CHANGES for (const auto& _row : _overrideSelectorRows) - _row.get()->UpdateOverrideToggles(); + _row->UpdateOverrideToggles(); __DEVICES_JOINTS_END_CHANGES } @@ -107,28 +107,28 @@ namespace winrt::Microsoft::UI::Xaml::Controls for (const auto& _row : _overrideSelectorRows) { - _row.get()->TrackerCombo().get()->IsEnabled( - _row.get()->Tracker()->data_isActive); // Is tracker ON? + _row->TrackerCombo()->IsEnabled( + _row->Tracker()->data_isActive); // Is tracker ON? - _row.get()->OverridePositionSwitch().get()->IsEnabled( - _row.get()->Tracker()->data_isActive); // Is tracker ON? + _row->OverridePositionSwitch()->IsEnabled( + _row->Tracker()->data_isActive); // Is tracker ON? - _row.get()->OverrideOrientationSwitch().get()->IsEnabled( - _row.get()->Tracker()->data_isActive); // Is tracker ON? + _row->OverrideOrientationSwitch()->IsEnabled( + _row->Tracker()->data_isActive); // Is tracker ON? // Change the placeholder to 'Joint Disabled' - _row.get()->TrackerCombo().get()->PlaceholderText( + _row->TrackerCombo()->PlaceholderText( k2app::interfacing::LocalizedResourceWString( L"DevicesPage", L"Placeholders/Joints/Disabled/PlaceholderText")); // Optionally show the placeholder - if (!_row.get()->Tracker()->data_isActive) + if (!_row->Tracker()->data_isActive) { - _row.get()->OverridePositionSwitch().get()->IsOn(false); - _row.get()->OverrideOrientationSwitch().get()->IsOn(false); + _row->OverridePositionSwitch()->IsOn(false); + _row->OverrideOrientationSwitch()->IsOn(false); // Show the placeholder - _row.get()->TrackerCombo().get()->SelectedIndex(-1); + _row->TrackerCombo()->SelectedIndex(-1); } } @@ -152,7 +152,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_container_panel.get()->Children().Clear(); + _ptr_container_panel->Children().Clear(); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -172,7 +172,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_container_panel.get()->Children().Append(*_ptr_header); + _ptr_container_panel->Children().Append(*_ptr_header); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -197,7 +197,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls { [&, this] { - _ptr_container_panel.get()->Children().Append(*_row.get()->Container()); + _ptr_container_panel->Children().Append(*_row->Container()); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -420,17 +420,17 @@ namespace winrt::Microsoft::UI::Xaml::Controls _ptr_header = std::make_shared(_header); // Set up some signals - _ptr_container_expander.get()->Expanding( + _ptr_container_expander->Expanding( [this](const Expander& sender, const ExpanderExpandingEventArgs& e) -> void { for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) if (expander->ContainerExpander().get() != nullptr && expander->ContainerExpander().get() != _ptr_container_expander.get()) - expander->ContainerExpander().get()->IsExpanded(false); + expander->ContainerExpander()->IsExpanded(false); }); - _ptr_container_expander.get()->Expanding([&](const auto&, const auto&) + _ptr_container_expander->Expanding([&](const auto&, const auto&) { // Don't react to pre-init signals if (!k2app::shared::devices::devices_tab_setup_finished)return; @@ -439,7 +439,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls playAppSound(k2app::interfacing::sounds::AppSounds::Show); }); - _ptr_container_expander.get()->Collapsed([&](const auto&, const auto&) + _ptr_container_expander->Collapsed([&](const auto&, const auto&) { // Don't react to pre-init signals if (!k2app::shared::devices::devices_tab_setup_finished)return; @@ -471,20 +471,20 @@ namespace k2app::interfacing // Optionally fix combos for disabled trackers -> joint selectors for base for (const auto& expander : jointSelectorExpanders) - for (std::shared_ptr& row : *expander.get()->JointSelectorRows()) + for (std::shared_ptr& row : *expander->JointSelectorRows()) { Helpers::SetComboBoxIsEnabled_Safe( - row.get()->TrackerCombo(), - row.get()->Tracker()->data_isActive); + row->TrackerCombo(), + row->Tracker()->data_isActive); - if (!row.get()->Tracker()->data_isActive) + if (!row->Tracker()->data_isActive) Helpers::SelectComboBoxItem_Safe( - row.get()->TrackerCombo(), -1); // Placeholder + row->TrackerCombo(), -1); // Placeholder } // Optionally fix combos for disabled trackers -> joint selectors for override for (const auto& expander : overrideSelectorExpanders) - expander.get()->UpdateIsEnabled(); + expander->UpdateIsEnabled(); __DEVICES_JOINTS_END_CHANGES } diff --git a/Amethyst/OverrideSelectorRow.h b/Amethyst/OverrideSelectorRow.h index bab8704c..d038baec 100644 --- a/Amethyst/OverrideSelectorRow.h +++ b/Amethyst/OverrideSelectorRow.h @@ -39,11 +39,11 @@ namespace winrt::Microsoft::UI::Xaml::Controls::Helpers item.Opacity(0.7); // Push the item to the combobox - cbox.get()->Items().Append(box_value(item)); + cbox->Items().Append(box_value(item)); } else // Push the item to the combobox - cbox.get()->Items().Append(box_value(str)); + cbox->Items().Append(box_value(str)); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -124,7 +124,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls::Helpers [&] { // Clear the combobox - cbox.get()->Items().Clear(); + cbox->Items().Clear(); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -146,7 +146,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls::Helpers { __try { - cbox.get()->SelectedIndex(index); + cbox->SelectedIndex(index); } __except (EXCEPTION_EXECUTE_HANDLER) { @@ -166,7 +166,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls::Helpers { __try { - cbox.get()->IsEnabled(enabled); + cbox->IsEnabled(enabled); } __except (EXCEPTION_EXECUTE_HANDLER) { @@ -247,8 +247,8 @@ namespace winrt::Microsoft::UI::Xaml::Controls const bool _o_this_device = _tracker_pointer->overrideGUID == k2app::shared::devices::selectedTrackingDeviceGUIDPair.first; - _ptr_override_position_switch.get()->IsOn(_o_this_device && _tracker_pointer->isPositionOverridden); - _ptr_override_orientation_switch.get()->IsOn(_o_this_device && _tracker_pointer->isRotationOverridden); + _ptr_override_position_switch->IsOn(_o_this_device && _tracker_pointer->isPositionOverridden); + _ptr_override_orientation_switch->IsOn(_o_this_device && _tracker_pointer->isRotationOverridden); } // devices_push_override_joints @@ -460,19 +460,19 @@ namespace winrt::Microsoft::UI::Xaml::Controls return; // If the selected joint is valid - if (_ptr_tracker_combo.get()->SelectedIndex() > 0) + if (_ptr_tracker_combo->SelectedIndex() > 0) { // Set the override polling joint ID _tracker_pointer->overrideJointID = - _ptr_tracker_combo.get()->SelectedIndex() - 1; // minus the "off" item + _ptr_tracker_combo->SelectedIndex() - 1; // minus the "off" item // Set the override polling device - the current one _tracker_pointer->overrideGUID = k2app::shared::devices::selectedTrackingDeviceGUIDPair.first; // If we've disabled the both overrides, re-enable them - if (!_ptr_override_position_switch.get()->IsOn() && - !_ptr_override_orientation_switch.get()->IsOn()) + if (!_ptr_override_position_switch->IsOn() && + !_ptr_override_orientation_switch->IsOn()) { // Toggle the switches on OverridePositionSwitch()->IsOn(true); @@ -498,7 +498,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls else { // Disable the override - _ptr_tracker_combo.get()->SelectedIndex(0); + _ptr_tracker_combo->SelectedIndex(0); // Disable the override, should auto-handle OverridePositionSwitch()->IsOn(false); @@ -537,23 +537,23 @@ namespace winrt::Microsoft::UI::Xaml::Controls std::get(device_pair.second)->getTrackedJoints(). empty()) { - _ptr_override_position_switch.get()->IsOn(false); - k2app::shared::devices::noJointsFlyout.get()->ShowAt(*k2app::shared::devices::overridesLabel); + _ptr_override_position_switch->IsOn(false); + k2app::shared::devices::noJointsFlyout->ShowAt(*k2app::shared::devices::overridesLabel); return; // Don't set up any overrides (yet) } // Play a sound - playAppSound(_ptr_override_position_switch.get()->IsOn() + playAppSound(_ptr_override_position_switch->IsOn() ? k2app::interfacing::sounds::AppSounds::ToggleOn : k2app::interfacing::sounds::AppSounds::ToggleOff); // Change the config - _tracker_pointer->isPositionOverridden = _ptr_override_position_switch.get()->IsOn(); - _tracker_pointer->isRotationOverridden = _ptr_override_orientation_switch.get()->IsOn(); + _tracker_pointer->isPositionOverridden = _ptr_override_position_switch->IsOn(); + _tracker_pointer->isRotationOverridden = _ptr_override_orientation_switch->IsOn(); // If we've disabled the both overrides, show the "Disabled" text - if (!_ptr_override_position_switch.get()->IsOn() && - !_ptr_override_orientation_switch.get()->IsOn()) + if (!_ptr_override_position_switch->IsOn() && + !_ptr_override_orientation_switch->IsOn()) { // Reset the override polling joint ID Helpers::SelectComboBoxItem_Safe(_ptr_tracker_combo, 0); @@ -563,8 +563,8 @@ namespace winrt::Microsoft::UI::Xaml::Controls } // Select the first valid item when turning the override on - if (_ptr_tracker_combo.get()->SelectedIndex() <= 0 && - _ptr_override_position_switch.get()->IsOn()) + if (_ptr_tracker_combo->SelectedIndex() <= 0 && + _ptr_override_position_switch->IsOn()) Helpers::SelectComboBoxItem_Safe(_ptr_tracker_combo, 1); // Check for errors and disable combos @@ -590,23 +590,23 @@ namespace winrt::Microsoft::UI::Xaml::Controls std::get(device_pair.second)->getTrackedJoints(). empty()) { - _ptr_override_orientation_switch.get()->IsOn(false); - k2app::shared::devices::noJointsFlyout.get()->ShowAt(*k2app::shared::devices::overridesLabel); + _ptr_override_orientation_switch->IsOn(false); + k2app::shared::devices::noJointsFlyout->ShowAt(*k2app::shared::devices::overridesLabel); return; // Don't set up any overrides (yet) } // Play a sound - playAppSound(_ptr_override_orientation_switch.get()->IsOn() + playAppSound(_ptr_override_orientation_switch->IsOn() ? k2app::interfacing::sounds::AppSounds::ToggleOn : k2app::interfacing::sounds::AppSounds::ToggleOff); // Change the config - _tracker_pointer->isPositionOverridden = _ptr_override_position_switch.get()->IsOn(); - _tracker_pointer->isRotationOverridden = _ptr_override_orientation_switch.get()->IsOn(); + _tracker_pointer->isPositionOverridden = _ptr_override_position_switch->IsOn(); + _tracker_pointer->isRotationOverridden = _ptr_override_orientation_switch->IsOn(); // If we've disabled the both overrides, show the "Disabled" text - if (!_ptr_override_position_switch.get()->IsOn() && - !_ptr_override_orientation_switch.get()->IsOn()) + if (!_ptr_override_position_switch->IsOn() && + !_ptr_override_orientation_switch->IsOn()) { // Reset the override polling joint ID Helpers::SelectComboBoxItem_Safe(_ptr_tracker_combo, 0); @@ -616,8 +616,8 @@ namespace winrt::Microsoft::UI::Xaml::Controls } // Select the first valid item when turning the override on - if (_ptr_tracker_combo.get()->SelectedIndex() <= 0 && - _ptr_override_orientation_switch.get()->IsOn()) + if (_ptr_tracker_combo->SelectedIndex() <= 0 && + _ptr_override_orientation_switch->IsOn()) Helpers::SelectComboBoxItem_Safe(_ptr_tracker_combo, 1); // Check for errors and disable combos diff --git a/Amethyst/SettingsPage.xaml.cpp b/Amethyst/SettingsPage.xaml.cpp index 721104f0..d4e16d7e 100644 --- a/Amethyst/SettingsPage.xaml.cpp +++ b/Amethyst/SettingsPage.xaml.cpp @@ -21,7 +21,7 @@ void settings_safe_clear(const std::shared_ptr& panel) { [&] { - panel.get()->Children().Clear(); + panel->Children().Clear(); }(); } __except (EXCEPTION_EXECUTE_HANDLER) @@ -248,15 +248,15 @@ namespace winrt::Amethyst::implementation for (const auto& expander : jointExpanderVector) expander->EnableSoftwareOrientation(_sup); - flipToggle.get()->IsEnabled( + flipToggle->IsEnabled( std::get(trackingDevice)->isFlipSupported()); - flipDropDown.get()->IsEnabled(k2app::K2Settings.isFlipEnabled && + flipDropDown->IsEnabled(k2app::K2Settings.isFlipEnabled && std::get(trackingDevice)->isFlipSupported()); - flipDropDownGrid.get()->Opacity(flipToggle.get()->IsEnabled() ? 1 : 0.5); + flipDropDownGrid->Opacity(flipToggle->IsEnabled() ? 1 : 0.5); // Hide/Show the flip controls container - flipDropDownContainer.get()->Visibility( - flipToggle.get()->IsEnabled() + flipDropDownContainer->Visibility( + flipToggle->IsEnabled() ? Visibility::Visible : Visibility::Collapsed); @@ -268,12 +268,12 @@ namespace winrt::Amethyst::implementation for (const auto& expander : jointExpanderVector) expander->EnableSoftwareOrientation(false); - flipToggle.get()->IsEnabled(false); - flipDropDown.get()->IsEnabled(false); - flipDropDownGrid.get()->Opacity(0.5); + flipToggle->IsEnabled(false); + flipDropDown->IsEnabled(false); + flipDropDownGrid->Opacity(0.5); // Hide the flip controls container - flipDropDownContainer.get()->Visibility(Visibility::Collapsed); + flipDropDownContainer->Visibility(Visibility::Collapsed); TrackingDevices::settings_set_external_flip_is_enabled(); } @@ -710,8 +710,8 @@ void Amethyst::implementation::SettingsPage::SettingsPage_Loaded_Handler() ForeignLangGrid().Visibility(Visibility::Visible); // Select saved flip, position and rotation options - flipToggle.get()->IsOn(k2app::K2Settings.isFlipEnabled); - externalFlipCheckBox.get()->IsChecked(k2app::K2Settings.isExternalFlipEnabled); + flipToggle->IsOn(k2app::K2Settings.isFlipEnabled); + externalFlipCheckBox->IsChecked(k2app::K2Settings.isExternalFlipEnabled); if (const auto& trackingDevice = TrackingDevices::getCurrentDevice(); trackingDevice.index() == 0) @@ -723,15 +723,15 @@ void Amethyst::implementation::SettingsPage::SettingsPage_Loaded_Handler() for (const auto& expander : jointExpanderVector) expander->EnableSoftwareOrientation(_sup); - flipToggle.get()->IsEnabled( + flipToggle->IsEnabled( std::get(trackingDevice)->isFlipSupported()); - flipDropDown.get()->IsEnabled(k2app::K2Settings.isFlipEnabled && + flipDropDown->IsEnabled(k2app::K2Settings.isFlipEnabled && std::get(trackingDevice)->isFlipSupported()); - flipDropDownGrid.get()->Opacity(flipToggle.get()->IsEnabled() ? 1 : 0.5); + flipDropDownGrid->Opacity(flipToggle->IsEnabled() ? 1 : 0.5); // Hide/Show the flip controls container - flipDropDownContainer.get()->Visibility( - flipToggle.get()->IsEnabled() + flipDropDownContainer->Visibility( + flipToggle->IsEnabled() ? Visibility::Visible : Visibility::Collapsed); @@ -743,12 +743,12 @@ void Amethyst::implementation::SettingsPage::SettingsPage_Loaded_Handler() for (const auto& expander : jointExpanderVector) expander->EnableSoftwareOrientation(false); - flipToggle.get()->IsEnabled(false); - flipDropDown.get()->IsEnabled(false); - flipDropDownGrid.get()->Opacity(0.5); + flipToggle->IsEnabled(false); + flipDropDown->IsEnabled(false); + flipDropDownGrid->Opacity(0.5); // Hide the flip controls container - flipDropDownContainer.get()->Visibility(Visibility::Collapsed); + flipDropDownContainer->Visibility(Visibility::Collapsed); TrackingDevices::settings_set_external_flip_is_enabled(); } @@ -760,7 +760,7 @@ void Amethyst::implementation::SettingsPage::SettingsPage_Loaded_Handler() // Load auto-spawn and sounds config autoSpawnCheckbox->IsChecked(k2app::K2Settings.autoSpawnEnabledJoints); enableSoundsCheckbox->IsChecked(k2app::K2Settings.enableAppSounds); - soundsVolumeSlider.get()->Value(k2app::K2Settings.appSoundsVolume); + soundsVolumeSlider->Value(k2app::K2Settings.appSoundsVolume); // Enable/Disable Ext/Flip TrackingDevices::settings_set_external_flip_is_enabled(); @@ -846,7 +846,7 @@ void Amethyst::implementation::SettingsPage::SoundsVolumeSlider_ValueChanged( // Change sounds level k2app::K2Settings.appSoundsVolume = - k2app::shared::settings::soundsVolumeSlider.get()->Value(); + k2app::shared::settings::soundsVolumeSlider->Value(); // Save settings k2app::K2Settings.saveSettings(); @@ -1330,15 +1330,15 @@ void Amethyst::implementation::SettingsPage::TrackerConfigButton_Click( for (const auto& expander : jointExpanderVector) expander->EnableSoftwareOrientation(_sup); - flipToggle.get()->IsEnabled( + flipToggle->IsEnabled( std::get(trackingDevice)->isFlipSupported()); - flipDropDown.get()->IsEnabled(k2app::K2Settings.isFlipEnabled && + flipDropDown->IsEnabled(k2app::K2Settings.isFlipEnabled && std::get(trackingDevice)->isFlipSupported()); - flipDropDownGrid.get()->Opacity(flipToggle.get()->IsEnabled() ? 1 : 0.5); + flipDropDownGrid->Opacity(flipToggle->IsEnabled() ? 1 : 0.5); // Hide/Show the flip controls container - flipDropDownContainer.get()->Visibility( - flipToggle.get()->IsEnabled() + flipDropDownContainer->Visibility( + flipToggle->IsEnabled() ? Visibility::Visible : Visibility::Collapsed); @@ -1350,12 +1350,12 @@ void Amethyst::implementation::SettingsPage::TrackerConfigButton_Click( for (const auto& expander : jointExpanderVector) expander->EnableSoftwareOrientation(false); - flipToggle.get()->IsEnabled(false); - flipDropDown.get()->IsEnabled(false); - flipDropDownGrid.get()->Opacity(0.5); + flipToggle->IsEnabled(false); + flipDropDown->IsEnabled(false); + flipDropDownGrid->Opacity(0.5); // Hide the flip controls container - flipDropDownContainer.get()->Visibility(Visibility::Collapsed); + flipDropDownContainer->Visibility(Visibility::Collapsed); TrackingDevices::settings_set_external_flip_is_enabled(); } @@ -1395,7 +1395,7 @@ void Amethyst::implementation::SettingsPage::TrackerConfigButton_Click( LOG(WARNING) << "All trackers have been disabled, force-enabling the waist tracker!"; // Enable the wiast tracker (no need to worry about the dispatcher, we're already inside) - jointExpanderVector.front()->JointSwitch().get()->IsOn(true); + jointExpanderVector.front()->JointSwitch()->IsOn(true); // Save settings k2app::K2Settings.saveSettings(); @@ -1508,15 +1508,15 @@ void Amethyst::implementation::SettingsPage::TrackerConfigButton_Click( for (const auto& expander : jointExpanderVector) expander->EnableSoftwareOrientation(_sup); - flipToggle.get()->IsEnabled( + flipToggle->IsEnabled( std::get(trackingDevice)->isFlipSupported()); - flipDropDown.get()->IsEnabled(k2app::K2Settings.isFlipEnabled && + flipDropDown->IsEnabled(k2app::K2Settings.isFlipEnabled && std::get(trackingDevice)->isFlipSupported()); - flipDropDownGrid.get()->Opacity(flipToggle.get()->IsEnabled() ? 1 : 0.5); + flipDropDownGrid->Opacity(flipToggle->IsEnabled() ? 1 : 0.5); // Hide/Show the flip controls container - flipDropDownContainer.get()->Visibility( - flipToggle.get()->IsEnabled() + flipDropDownContainer->Visibility( + flipToggle->IsEnabled() ? Visibility::Visible : Visibility::Collapsed); @@ -1528,12 +1528,12 @@ void Amethyst::implementation::SettingsPage::TrackerConfigButton_Click( for (const auto& expander : jointExpanderVector) expander->EnableSoftwareOrientation(false); - flipToggle.get()->IsEnabled(false); - flipDropDown.get()->IsEnabled(false); - flipDropDownGrid.get()->Opacity(0.5); + flipToggle->IsEnabled(false); + flipDropDown->IsEnabled(false); + flipDropDownGrid->Opacity(0.5); // Hide the flip controls container - flipDropDownContainer.get()->Visibility(Visibility::Collapsed); + flipDropDownContainer->Visibility(Visibility::Collapsed); TrackingDevices::settings_set_external_flip_is_enabled(); } diff --git a/Amethyst/TrackingDevices.h b/Amethyst/TrackingDevices.h index 6d773786..b15a0c3b 100644 --- a/Amethyst/TrackingDevices.h +++ b/Amethyst/TrackingDevices.h @@ -132,8 +132,8 @@ namespace TrackingDevices if (k2app::shared::devices::devicesTreeView.get() != nullptr && devices_navigate_index.second >= 0) { - k2app::shared::devices::devicesTreeView.get()->SelectedNode( - k2app::shared::devices::devicesTreeView.get()->RootNodes(). + k2app::shared::devices::devicesTreeView->SelectedNode( + k2app::shared::devices::devicesTreeView->RootNodes(). GetAt(devices_navigate_index.second)); // Backup @@ -162,24 +162,24 @@ namespace TrackingDevices base_status_ok = true; // Skip if the server's failed // If the server driver's OK - k2app::shared::general::errorWhatText.get()->Visibility( + k2app::shared::general::errorWhatText->Visibility( base_status_ok ? Visibility::Collapsed : Visibility::Visible); - k2app::shared::general::errorWhatGrid.get()->Visibility( + k2app::shared::general::errorWhatGrid->Visibility( base_status_ok ? Visibility::Collapsed : Visibility::Visible); - k2app::shared::general::errorButtonsGrid.get()->Visibility( + k2app::shared::general::errorButtonsGrid->Visibility( base_status_ok ? Visibility::Collapsed : Visibility::Visible); - k2app::shared::general::trackingDeviceErrorLabel.get()->Visibility( + k2app::shared::general::trackingDeviceErrorLabel->Visibility( base_status_ok ? Visibility::Collapsed : Visibility::Visible); // Split status and message by \n - k2app::shared::general::deviceNameLabel.get()->Text(deviceName); - k2app::shared::general::deviceStatusLabel.get()->Text(split_status(device_status_string)[0]); - k2app::shared::general::trackingDeviceErrorLabel.get()->Text(split_status(device_status_string)[1]); - k2app::shared::general::errorWhatText.get()->Text(split_status(device_status_string)[2]); + k2app::shared::general::deviceNameLabel->Text(deviceName); + k2app::shared::general::deviceStatusLabel->Text(split_status(device_status_string)[0]); + k2app::shared::general::trackingDeviceErrorLabel->Text(split_status(device_status_string)[1]); + k2app::shared::general::errorWhatText->Text(split_status(device_status_string)[2]); // Dim the calibration button if can't calibrate right now - k2app::shared::general::calibrationButton.get()->Opacity( - (!k2app::shared::general::calibrationButton.get()->IsEnabled() // Don't dim if disabled + k2app::shared::general::calibrationButton->Opacity( + (!k2app::shared::general::calibrationButton->IsEnabled() // Don't dim if disabled || !k2app::K2Settings.overrideDeviceGUIDsMap.empty() // Don't dim if we have overrides || base_status_ok) ? 1.0 // We're fine if any of the upper conditions is met @@ -190,7 +190,7 @@ namespace TrackingDevices if (k2app::shared::general::additionalDeviceErrorsHyperlink.get() != nullptr) { // Show the 'additional errors' button if there are errors - k2app::shared::general::additionalDeviceErrorsHyperlink.get()->Visibility( + k2app::shared::general::additionalDeviceErrorsHyperlink->Visibility( // Skip if the server driver's not present (override_status_ok || !k2app::interfacing::isServerDriverPresent) ? Visibility::Collapsed @@ -216,7 +216,7 @@ namespace TrackingDevices if (k2app::shared::settings::flipDropDown.get() != nullptr) { // Overwritten a bit earlier - k2app::shared::settings::flipToggle.get()->IsOn(k2app::K2Settings.isFlipEnabled); + k2app::shared::settings::flipToggle->IsOn(k2app::K2Settings.isFlipEnabled); // Enable/disable mathbased & flip elements if (trackingDevice.index() == 0) @@ -228,16 +228,16 @@ namespace TrackingDevices for (const auto& expander : k2app::shared::settings::jointExpanderVector) expander->EnableSoftwareOrientation(_sup); - k2app::shared::settings::flipToggle.get()->IsEnabled( + k2app::shared::settings::flipToggle->IsEnabled( std::get(trackingDevice)->isFlipSupported()); - k2app::shared::settings::flipDropDown.get()->IsEnabled(k2app::K2Settings.isFlipEnabled && + k2app::shared::settings::flipDropDown->IsEnabled(k2app::K2Settings.isFlipEnabled && std::get(trackingDevice)->isFlipSupported()); - k2app::shared::settings::flipDropDownGrid.get()->Opacity( - k2app::shared::settings::flipToggle.get()->IsEnabled() ? 1 : 0.5); + k2app::shared::settings::flipDropDownGrid->Opacity( + k2app::shared::settings::flipToggle->IsEnabled() ? 1 : 0.5); // Hide/Show the flip controls container - k2app::shared::settings::flipDropDownContainer.get()->Visibility( - k2app::shared::settings::flipToggle.get()->IsEnabled() + k2app::shared::settings::flipDropDownContainer->Visibility( + k2app::shared::settings::flipToggle->IsEnabled() ? Visibility::Visible : Visibility::Collapsed); } @@ -247,12 +247,12 @@ namespace TrackingDevices for (const auto& expander : k2app::shared::settings::jointExpanderVector) expander->EnableSoftwareOrientation(false); - k2app::shared::settings::flipToggle.get()->IsEnabled(false); - k2app::shared::settings::flipDropDown.get()->IsEnabled(false); - k2app::shared::settings::flipDropDownGrid.get()->Opacity(0.5); + k2app::shared::settings::flipToggle->IsEnabled(false); + k2app::shared::settings::flipDropDown->IsEnabled(false); + k2app::shared::settings::flipDropDownGrid->Opacity(0.5); // Hide the flip controls container - k2app::shared::settings::flipDropDownContainer.get()->Visibility(Visibility::Collapsed); + k2app::shared::settings::flipDropDownContainer->Visibility(Visibility::Collapsed); } // Update extflip settings_set_external_flip_is_enabled(); @@ -387,26 +387,26 @@ namespace TrackingDevices device_status_string = device->statusResultWString(device_status); // Update the device name - k2app::shared::devices::deviceNameLabel.get()->Text(device->getDeviceName()); + k2app::shared::devices::deviceNameLabel->Text(device->getDeviceName()); // We've selected a SkeletonBasis device, so this should be hidden for (auto& expander : k2app::shared::devices::jointSelectorExpanders) - expander.get()->SetVisibility(Visibility::Collapsed); + expander->SetVisibility(Visibility::Collapsed); - k2app::shared::devices::jointBasisLabel.get()->Visibility(Visibility::Collapsed); + k2app::shared::devices::jointBasisLabel->Visibility(Visibility::Collapsed); // Show / Hide the override expanders for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) // Collapse on fails & non-overrides - expander.get()->SetVisibility( + expander->SetVisibility( device_status == S_OK && IsAnOverride(device->getDeviceGUID()) ? Visibility::Visible : Visibility::Collapsed); // Collapse on fails & non-overrides - k2app::shared::devices::overridesLabel.get()->Visibility( + k2app::shared::devices::overridesLabel->Visibility( device_status == S_OK && IsAnOverride(device->getDeviceGUID()) ? Visibility::Visible @@ -420,11 +420,11 @@ namespace TrackingDevices { // Clear items for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) - expander.get()->ReAppendTrackers(); + expander->ReAppendTrackers(); // Push the placeholder to all combos for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) - expander.get()->PushOverrideJoint( + expander->PushOverrideJoint( k2app::interfacing::LocalizedResourceWString( L"DevicesPage", L"Placeholders/Overrides/NoOverride/PlaceholderText"), true); @@ -434,19 +434,19 @@ namespace TrackingDevices case ktvr::K2_Character_Basic: { for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) - expander.get()->PushOverrideJoints(false); + expander->PushOverrideJoints(false); } break; case ktvr::K2_Character_Simple: { for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) - expander.get()->PushOverrideJoints(); + expander->PushOverrideJoints(); } break; case ktvr::K2_Character_Full: { for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) - expander.get()->PushOverrideJoints(); + expander->PushOverrideJoints(); } break; } @@ -458,23 +458,23 @@ namespace TrackingDevices { // Select the first (or next, if exists) joint // Set the placeholder text on disabled combos - expander.get()->SelectComboItems(); + expander->SelectComboItems(); // Select enabled overrides - expander.get()->UpdateOverrideToggles(); + expander->UpdateOverrideToggles(); } } } // Show / Hide device settings - k2app::shared::devices::selectedDeviceSettingsHostContainer.get()->Visibility( + k2app::shared::devices::selectedDeviceSettingsHostContainer->Visibility( device->isSettingsDaemonSupported() ? Visibility::Visible : Visibility::Collapsed); // Append device settings / placeholder layout - k2app::shared::devices::selectedDeviceSettingsRootLayoutPanel.get()->Children().Clear(); - k2app::shared::devices::selectedDeviceSettingsRootLayoutPanel.get()->Children().Append( + k2app::shared::devices::selectedDeviceSettingsRootLayoutPanel->Children().Clear(); + k2app::shared::devices::selectedDeviceSettingsRootLayoutPanel->Children().Append( device->isSettingsDaemonSupported() ? *TrackingDevicesLayoutRootsVector.at( k2app::shared::devices::selectedTrackingDeviceGUIDPair.second)->Get() @@ -492,18 +492,18 @@ namespace TrackingDevices device_status_string = device->statusResultWString(device_status); // Update the device name - k2app::shared::devices::deviceNameLabel.get()->Text(device->getDeviceName()); + k2app::shared::devices::deviceNameLabel->Text(device->getDeviceName()); // We've selected a jointsbasis device, so this should be visible // at least when the device is online for (auto& expander : k2app::shared::devices::jointSelectorExpanders) - expander.get()->SetVisibility( + expander->SetVisibility( (device_status == S_OK && IsABase(k2app::shared::devices::selectedTrackingDeviceGUIDPair.first)) ? Visibility::Visible : Visibility::Collapsed); - k2app::shared::devices::jointBasisLabel.get()->Visibility( + k2app::shared::devices::jointBasisLabel->Visibility( (device_status == S_OK && IsABase(k2app::shared::devices::selectedTrackingDeviceGUIDPair.first)) ? Visibility::Visible @@ -513,14 +513,14 @@ namespace TrackingDevices for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) // Collapse on fails & non-overrides - expander.get()->SetVisibility( + expander->SetVisibility( device_status == S_OK && IsAnOverride(device->getDeviceGUID()) ? Visibility::Visible : Visibility::Collapsed); // Collapse on fails & non-overrides - k2app::shared::devices::overridesLabel.get()->Visibility( + k2app::shared::devices::overridesLabel->Visibility( device_status == S_OK && IsAnOverride(device->getDeviceGUID()) ? Visibility::Visible @@ -533,7 +533,7 @@ namespace TrackingDevices if (IsABase(k2app::shared::devices::selectedTrackingDeviceGUIDPair.first)) { for (auto& expander : k2app::shared::devices::jointSelectorExpanders) - expander.get()->ReAppendTrackers(); + expander->ReAppendTrackers(); } // If we're reconnecting an override device, also refresh joints @@ -541,11 +541,11 @@ namespace TrackingDevices { // Clear items for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) - expander.get()->ReAppendTrackers(); + expander->ReAppendTrackers(); // Push the placeholder to all combos for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) - expander.get()->PushOverrideJoint( + expander->PushOverrideJoint( k2app::interfacing::LocalizedResourceWString( L"DevicesPage", L"Placeholders/Overrides/NoOverride/PlaceholderText"), true); @@ -553,7 +553,7 @@ namespace TrackingDevices for (const auto& _joint : device->getTrackedJoints()) // Push the name to all combos for (auto& expander : k2app::shared::devices::overrideSelectorExpanders) - expander.get()->PushOverrideJoint(_joint.getJointName()); + expander->PushOverrideJoint(_joint.getJointName()); // Try fix override IDs if wrong @@ -563,23 +563,23 @@ namespace TrackingDevices { // Select the first (or next, if exists) joint // Set the placeholder text on disabled combos - expander.get()->SelectComboItems(); + expander->SelectComboItems(); // Select enabled overrides - expander.get()->UpdateOverrideToggles(); + expander->UpdateOverrideToggles(); } } } // Show / Hide device settings - k2app::shared::devices::selectedDeviceSettingsHostContainer.get()->Visibility( + k2app::shared::devices::selectedDeviceSettingsHostContainer->Visibility( device->isSettingsDaemonSupported() ? Visibility::Visible : Visibility::Collapsed); // Append device settings / placeholder layout - k2app::shared::devices::selectedDeviceSettingsRootLayoutPanel.get()->Children().Clear(); - k2app::shared::devices::selectedDeviceSettingsRootLayoutPanel.get()->Children().Append( + k2app::shared::devices::selectedDeviceSettingsRootLayoutPanel->Children().Clear(); + k2app::shared::devices::selectedDeviceSettingsRootLayoutPanel->Children().Append( device->isSettingsDaemonSupported() ? *TrackingDevicesLayoutRootsVector.at( k2app::shared::devices::selectedTrackingDeviceGUIDPair.second)->Get() @@ -592,20 +592,20 @@ namespace TrackingDevices /* Update local statuses */ // Update the status here - k2app::shared::devices::errorWhatText.get()->Visibility( + k2app::shared::devices::errorWhatText->Visibility( device_status == S_OK ? Visibility::Collapsed : Visibility::Visible); - k2app::shared::devices::deviceErrorGrid.get()->Visibility( + k2app::shared::devices::deviceErrorGrid->Visibility( device_status == S_OK ? Visibility::Collapsed : Visibility::Visible); - k2app::shared::devices::trackingDeviceErrorLabel.get()->Visibility( + k2app::shared::devices::trackingDeviceErrorLabel->Visibility( device_status == S_OK ? Visibility::Collapsed : Visibility::Visible); - k2app::shared::devices::trackingDeviceChangePanel.get()->Visibility( + k2app::shared::devices::trackingDeviceChangePanel->Visibility( device_status == S_OK ? Visibility::Visible : Visibility::Collapsed); // Split status and message by \n - k2app::shared::devices::deviceStatusLabel.get()->Text(split_status(device_status_string)[0]); - k2app::shared::devices::trackingDeviceErrorLabel.get()->Text(split_status(device_status_string)[1]); - k2app::shared::devices::errorWhatText.get()->Text(split_status(device_status_string)[2]); + k2app::shared::devices::deviceStatusLabel->Text(split_status(device_status_string)[0]); + k2app::shared::devices::trackingDeviceErrorLabel->Text(split_status(device_status_string)[1]); + k2app::shared::devices::errorWhatText->Text(split_status(device_status_string)[2]); // Refresh the device list MVVM RefreshDevicesMVVMList();