From 6a9891adee6a76ee857830a2c25e93ba1670abb0 Mon Sep 17 00:00:00 2001 From: TrueZhuanjia Date: Fri, 4 Jul 2025 21:00:04 +0800 Subject: [PATCH] c-module ready --- .gitmodules | 2 +- VoidLink/Input/CustomOSC/OSCProfilesManager.m | 11 ++++------- .../OSCProfilesTableViewController.m | 2 -- moonlight-common/moonlight-common-c | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index ee66cae2..6069213a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "moonlight-common/moonlight-common-c"] path = moonlight-common/moonlight-common-c -url=https://github.com/TrueZhuangJia/voidlink-common-c.git +url=https://github.com/TrueZhuangJia/voidlink-c.git [submodule "X1Kit"] path = X1Kit url = https://github.com/cgutman/X1Kit.git diff --git a/VoidLink/Input/CustomOSC/OSCProfilesManager.m b/VoidLink/Input/CustomOSC/OSCProfilesManager.m index f5eafea6..fd469676 100644 --- a/VoidLink/Input/CustomOSC/OSCProfilesManager.m +++ b/VoidLink/Input/CustomOSC/OSCProfilesManager.m @@ -330,9 +330,8 @@ static CGRect streamViewBounds; // save on-screen game controller buttons & sticks as buttonstate: for (CALayer *oscButtonLayer in oscButtonLayers) { - oscButtonLayer.position = [self normalizeWidgetPosition:oscButtonLayer.position]; - OnScreenButtonState *buttonState = [[OnScreenButtonState alloc] initWithButtonName:oscButtonLayer.name buttonType:LegacyOscButton andPosition:oscButtonLayer.position]; - oscButtonLayer.position = [self denormalizeWidgetPosition:oscButtonLayer.position]; + CGPoint normalizedPosition = [self normalizeWidgetPosition:oscButtonLayer.position]; + OnScreenButtonState *buttonState = [[OnScreenButtonState alloc] initWithButtonName:oscButtonLayer.name buttonType:LegacyOscButton andPosition:normalizedPosition]; // add hidden attr here buttonState.isHidden = oscButtonLayer.isHidden; buttonState.oscLayerSizeFactor = [OnScreenControls getControllerLayerSizeFactor:oscButtonLayer]; @@ -356,10 +355,8 @@ static CGRect streamViewBounds; // save on-screen widget views (keyboard & mouse command) as buttonstate: for(OnScreenWidgetView* widgetView in OnScreenWidgetViews){ - - widgetView.center = [self normalizeWidgetPosition:widgetView.center]; - OnScreenButtonState *buttonState = [[OnScreenButtonState alloc] initWithButtonName:widgetView.buttonLabel buttonType:CustomOnScreenWidget andPosition:widgetView.center]; - widgetView.center = [self denormalizeWidgetPosition:widgetView.center]; + CGPoint normalizedPosition = [self normalizeWidgetPosition:widgetView.center]; + OnScreenButtonState *buttonState = [[OnScreenButtonState alloc] initWithButtonName:widgetView.cmdString buttonType:CustomOnScreenWidget andPosition:normalizedPosition]; buttonState.alias = widgetView.buttonLabel; buttonState.widthFactor = widgetView.widthFactor; buttonState.heightFactor = widgetView.heightFactor; diff --git a/VoidLink/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m b/VoidLink/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m index 1eab8a4a..cde34b02 100644 --- a/VoidLink/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m +++ b/VoidLink/ViewControllers/CustomOSCViewControl/OSCProfilesTableViewController.m @@ -203,7 +203,6 @@ const double NAV_BAR_HEIGHT = 50; [self presentViewController:picker animated:YES completion:nil]; } - - (IBAction) importDataTapped:(id)sender { self.currentFileOperation = Import; // 2. 创建文件选择器 @@ -251,7 +250,6 @@ didPickDocumentsAtURLs:(NSArray *)urls { } } - - (void)fileToProfiles:(NSURL* )sourceURL{ bool restoreFailed = false; if (![sourceURL startAccessingSecurityScopedResource]) { diff --git a/moonlight-common/moonlight-common-c b/moonlight-common/moonlight-common-c index d3d3e6cf..58902e34 160000 --- a/moonlight-common/moonlight-common-c +++ b/moonlight-common/moonlight-common-c @@ -1 +1 @@ -Subproject commit d3d3e6cf015cd032ce02718246b52aabd1e12294 +Subproject commit 58902e342f6d53d6783c99fe79a03168d46cd56f