Skip to content

Commit

Permalink
Release v2.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
ClementGre committed Jul 23, 2024
1 parent a2cce51 commit d5286cb
Show file tree
Hide file tree
Showing 5 changed files with 139 additions and 49 deletions.
4 changes: 2 additions & 2 deletions ThreeFingerDragOnWindows/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Identity
Name="50931ClmentGrennerat.ThreeFingersDragOnWindows"
Publisher="CN=A5174EBF-789F-4CD5-BF8B-E0CB932DB9AD"
Version="2.0.4.0"/>
Version="2.0.5.0"/>

<mp:PhoneIdentity PhoneProductId="c9b9ff1d-920c-45c7-99c8-3e98f838bef5"
PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
Expand Down Expand Up @@ -50,7 +50,7 @@
<uap:LockScreen BadgeLogo="Assets\BadgeLogo.png" Notification="badgeAndTileText"/>
<uap:SplashScreen Image="Assets\SplashScreen.png"/>
</uap:VisualElements>

<Extensions>

<uap3:Extension Category="windows.appExecutionAlias" EntryPoint="Windows.FullTrustApplication">
Expand Down
31 changes: 19 additions & 12 deletions ThreeFingerDragOnWindows/ThreeFingerDragOnWindows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,24 @@
<RepositoryUrl>https://github.com/ClementGre/ThreeFingerDragOnWindows</RepositoryUrl>
<PackageTags>touchpad;tool;automation;finger</PackageTags>
<NeutralLanguage>en</NeutralLanguage>
<AssemblyVersion>2.0.4.0</AssemblyVersion>
<AssemblyVersion>2.0.5.0</AssemblyVersion>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Title>ThreeFingerDragOnWindows</Title>
<DisplayName>Three Finger Drag</DisplayName>
<SignAssembly>False</SignAssembly>
<ApplicationIcon>Assets\icon.ico</ApplicationIcon>
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
<PackageCertificateThumbprint>6349A95D0136104C9F4661F4CF74E8F35FA2F9D2</PackageCertificateThumbprint>
<PackageCertificateKeyFile>ThreeFingerDragOnWindows.pfx</PackageCertificateKeyFile>
<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
<!-- <PackageCertificateKeyFile>ThreeFingerDragOnWindows.pfx</PackageCertificateKeyFile>-->
<!-- <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>-->
<defineconstants>DISABLE_XAML_GENERATED_MAIN</defineconstants>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
<GenerateTestArtifacts>True</GenerateTestArtifacts>
<AppxBundle>Never</AppxBundle>
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
</PropertyGroup>
<ItemGroup>
<Content Remove="Assets\logo-44.altform-lightunplated_targetsize-16.png" />
Expand Down Expand Up @@ -102,16 +109,16 @@

<ItemGroup>
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.0.131" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240607001" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
<PackageReference Include="TaskScheduler" Version="2.11.0" />
<PackageReference Include="WinUICommunity.Components" Version="6.9.0" />
<PackageReference Include="WinUICommunity.Core" Version="6.9.0" />
<Manifest Include="$(ApplicationManifest)" />
<PackageReference Include="WinUICommunity.LandingPages" Version="6.9.0" />
</ItemGroup>
<!--

<!--
Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
Tools extension to be activated for this project even if the Windows App SDK Nuget
package has not yet been restored.
Expand All @@ -137,10 +144,10 @@
<Resource Remove="src\settings\ThreeFingerDragSettings.xaml" />
<Resource Remove="theme\Generic.xaml" />
</ItemGroup>
<!--
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
Explorer "Package and Publish" context menu entry to be enabled for this project even if

<!--
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
Explorer "Package and Publish" context menu entry to be enabled for this project even if
the Windows App SDK Nuget package has not yet been restored.
-->
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
Expand Down
10 changes: 5 additions & 5 deletions ThreeFingerDragOnWindows/settings/OtherSettings.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@


<wuc:SettingsCard Header="Run as administrator"
Description="If the app is not running as an administrator, the dragging processes will not function when a window with administrator privileges is in focus."
Description="If the app is not running as an administrator, the dragging process will not function when a window with administrator privileges is in focus."
HeaderIcon="{wuc:FontIcon FontFamily={StaticResource SymbolThemeFontFamily},
Glyph=&#xE7EF;}">
<ToggleSwitch x:Name="RunElevated" Toggled="RunElevated_Toggled"
Expand All @@ -54,12 +54,12 @@
<wuc:SettingsCard Header="Record logs"
Description="To record logs, enable logging, reproduce the issue you are having, disable logging, save the file and add it to a GitHub issue. The log file contains only the last 10000 lines of logs."
HeaderIcon="{wuc:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE8E5;}">

<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Spacing="10">
<ToggleSwitch x:Name="RecordLogs" IsOn="{x:Bind RecordLogsProperty, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
<Button x:Name="SaveLogsButton" Content="Save log file" Click="SaveLogsButton_Click" />
</StackPanel>

</wuc:SettingsCard>


Expand All @@ -75,7 +75,7 @@
<TextBlock Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Style="{StaticResource CaptionTextBlockStyle}"
Text="Version 2.0.4.0" />
Text="Version 2.0.5.0" />

<wuc:SettingsExpander.Items>
<wuc:SettingsCard HorizontalContentAlignment="Left"
Expand All @@ -101,4 +101,4 @@
</StackPanel>
</ScrollView>

</Page>
</Page>
6 changes: 3 additions & 3 deletions ThreeFingerDragOnWindows/touchpad/ContactsManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ContactsManager(HandlerWindow source){
public void InitializeSource(){
var touchpadExists = TouchpadHelper.Exists();
var inputReceiverInstalled = TouchpadHelper.RegisterInput(_hwnd);

_source.OnTouchpadInitialized(touchpadExists, inputReceiverInstalled);
}

Expand Down Expand Up @@ -80,12 +80,12 @@ private void RegisterTouchpadContact(TouchpadContact contact){
}
_lastContacts.Add(contact);
}

private void SendLastContacts(){
// If contacts have all been released for a long time, cancel the last contact list
if(Ctms() - _lastSendContacts < 50 && _lastContacts.Count > 0)
_source.OnTouchpadContact(_lastContacts.ToArray());

_lastContacts.Clear();
_lastSendContacts = Ctms();
}
Expand Down
Loading

0 comments on commit d5286cb

Please sign in to comment.