Skip to content

Commit 73f0e3c

Browse files
committed
launch jar files with java directly instead of open
versions now break in 2040 instead of 2026 change default eyeProjector show titlebar value
1 parent 5c854ce commit 73f0e3c

4 files changed

Lines changed: 16 additions & 10 deletions

File tree

SlackowWall.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@
510510
CODE_SIGN_IDENTITY = "Apple Development";
511511
CODE_SIGN_STYLE = Automatic;
512512
COMBINE_HIDPI_IMAGES = YES;
513-
CURRENT_PROJECT_VERSION = 260121;
513+
CURRENT_PROJECT_VERSION = 260123;
514514
DEAD_CODE_STRIPPING = YES;
515515
DEVELOPMENT_ASSET_PATHS = "\"SlackowWall/Resources/Preview Content\"";
516516
DEVELOPMENT_TEAM = 94CLS492CD;
@@ -528,7 +528,7 @@
528528
"@executable_path/../Frameworks",
529529
);
530530
MACOSX_DEPLOYMENT_TARGET = 13.5;
531-
MARKETING_VERSION = 1.3.9;
531+
MARKETING_VERSION = 1.4.0;
532532
PRODUCT_BUNDLE_IDENTIFIER = com.slackow.SlackowWall;
533533
PRODUCT_NAME = "$(TARGET_NAME)";
534534
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -547,7 +547,7 @@
547547
CODE_SIGN_IDENTITY = "Apple Development";
548548
CODE_SIGN_STYLE = Automatic;
549549
COMBINE_HIDPI_IMAGES = YES;
550-
CURRENT_PROJECT_VERSION = 260121;
550+
CURRENT_PROJECT_VERSION = 260123;
551551
DEAD_CODE_STRIPPING = YES;
552552
DEVELOPMENT_ASSET_PATHS = "\"SlackowWall/Resources/Preview Content\"";
553553
DEVELOPMENT_TEAM = 94CLS492CD;
@@ -565,7 +565,7 @@
565565
"@executable_path/../Frameworks",
566566
);
567567
MACOSX_DEPLOYMENT_TARGET = 13.5;
568-
MARKETING_VERSION = 1.3.9;
568+
MARKETING_VERSION = 1.4.0;
569569
PRODUCT_BUNDLE_IDENTIFIER = com.slackow.SlackowWall;
570570
PRODUCT_NAME = "$(TARGET_NAME)";
571571
PROVISIONING_PROFILE_SPECIFIER = "";

SlackowWall/Features/Capture/ViewModels/Engine/ScreenRecorder.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,10 @@ import SwiftUI
292292
guard let processID = window.owningApplication?.processID, let title = window.title
293293
else { return false }
294294

295-
let regex = /1\.(\d+)(\.\d+)?/
295+
// This WILL break in 2040 if the versioning system stays the same, if you're seeing this because that happened, that's cool honestly.
296+
let regex = /(1|2[6-9]|3\d)\.(\d+)(\.\d+)?/
296297
if let match = try? regex.firstMatch(in: title),
297-
let majorVersion = Int(match.output.1),
298-
majorVersion >= 6,
298+
max(Int(match.output.1) ?? 0, Int(match.output.2) ?? 0) >= 6,
299299
title.contains("Minecraft")
300300
{
301301
return trackingManager.getValues(\.pid).contains(processID)

SlackowWall/Features/Settings/Models/Sections/UtilitySection.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extension Preferences {
2020
var eyeProjectorOverlayOpacity: Double = 1.0
2121
var eyeProjectorOverlayImage: URL? = nil
2222
var eyeProjectorAlwaysOnTop: Bool = false
23-
var eyeProjectorTitleBarHidden: Bool = true
23+
var eyeProjectorTitleBarHidden: Bool = false
2424
var eyeProjectorShouldOpenWithTallMode: Bool {
2525
eyeProjectorEnabled && eyeProjectorOpenWithTallMode
2626
}

SlackowWall/SlackowWallApp.swift

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
210210
}
211211
if Settings[\.utility].startupApplicationEnabled {
212212
Settings[\.utility].startupApplications.forEach {
213+
let path = $0.path(percentEncoded: false)
213214
let task = Process()
214-
task.launchPath = "/usr/bin/open"
215-
task.arguments = [$0.path(percentEncoded: false)]
215+
if path.hasSuffix(".jar") {
216+
task.executableURL = URL(filePath: "/usr/bin/env")
217+
task.arguments = ["java", "-jar", path]
218+
} else {
219+
task.executableURL = URL(filePath: "/usr/bin/open")
220+
task.arguments = [path]
221+
}
216222
try? task.run()
217223
}
218224
}

0 commit comments

Comments
 (0)