Skip to content

Commit

Permalink
Use -> instead of .get()-> [pretty-code]
Browse files Browse the repository at this point in the history
  • Loading branch information
@KimihikoAkayasaki
KimihikoAkayasaki committed Oct 7, 2022
1 parent f6b0767 commit 7f63599
Show file tree
Hide file tree
Showing 15 changed files with 621 additions and 621 deletions.
68 changes: 34 additions & 34 deletions Amethyst/DevicesPage.xaml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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 " <<
Expand All @@ -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;
Expand All @@ -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
Expand All @@ -381,7 +381,7 @@ Windows::Foundation::IAsyncAction Amethyst::implementation::DevicesPage::SetAsOv
Sleep(100);
co_await ui_thread;

devicesOverridesSelectorStackPanelInner.get()->Transitions().Clear();
devicesOverridesSelectorStackPanelInner->Transitions().Clear();
}


Expand Down Expand Up @@ -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;
Expand All @@ -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);
}

Expand All @@ -450,7 +450,7 @@ Windows::Foundation::IAsyncAction Amethyst::implementation::DevicesPage::SetAsBa
Sleep(100);
co_await ui_thread;

devicesJointsBasisSelectorStackPanelInner.get()->Transitions().Clear();
devicesJointsBasisSelectorStackPanelInner->Transitions().Clear();
}


Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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();
Expand All @@ -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;
Expand All @@ -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);
}

Expand All @@ -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(
Expand Down
46 changes: 23 additions & 23 deletions Amethyst/GeneralPage.xaml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand Down Expand Up @@ -113,8 +113,8 @@ namespace winrt::Amethyst::implementation
// Create and push the offsets controller
offsetsController = std::move(std::make_shared<Controls::OffsetsController>());

offsetsControlHostGrid.get()->Children().Append(*offsetsController->Container());
offsetsControlHostGrid.get()->SetRow(*offsetsController->Container(), 0);
offsetsControlHostGrid->Children().Append(*offsetsController->Container());
offsetsControlHostGrid->SetRow(*offsetsController->Container(), 0);

offsetsController->ReAppendTrackerPivots();

Expand Down Expand Up @@ -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"))
Expand All @@ -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();
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion Amethyst/InfoPage.xaml.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
Loading

0 comments on commit 7f63599

Please sign in to comment.