FOSS/AyuGramDesktop
1
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2026-08-08 12:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wrapped NSSlider in NSCustomTouchBarItem to silence AppKit warning.

Browse Source
This commit is contained in:
23rd
2026-05-13 16:05:36 +03:00
parent ac498f8251
commit ab84fb8ec2
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.h
+1 -2
View File
@@ -16,7 +16,6 @@ struct TrackState;
@class NSButton;
@class NSCustomTouchBarItem;
@class NSImage;
@class NSSliderTouchBarItem;
namespace TouchBar {
@@ -51,7 +50,7 @@ NSButton *CreateTouchBarButtonWithTwoStates(
rpl::producer<bool> stateChanged = rpl::never<bool>());
[[nodiscard]] API_AVAILABLE(macos(10.12.2))
NSSliderTouchBarItem *CreateTouchBarSlider(
NSCustomTouchBarItem *CreateTouchBarSlider(
NSString *itemId,
rpl::lifetime &lifetime,
Fn<void(bool, double, double)> callback,
Telegram/SourceFiles/platform/mac/touchbar/mac_touchbar_controls.mm
+13 -11
View File
@@ -18,7 +18,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#import <AppKit/NSImage.h>
#import <AppKit/NSImageView.h>
#import <AppKit/NSSlider.h>
#import <AppKit/NSSliderTouchBarItem.h>
using namespace TouchBar;
@@ -208,17 +207,21 @@ NSButton *CreateTouchBarButtonWithTwoStates(
std::move(stateChanged));
}
NSSliderTouchBarItem *CreateTouchBarSlider(
NSCustomTouchBarItem *CreateTouchBarSlider(
NSString *itemId,
rpl::lifetime &lifetime,
Fn<void(bool, double, double)> callback,
rpl::producer<Media::Player::TrackState> stateChanged) {
const auto lastDurationMs = lifetime.make_state<crl::time>(0);
auto *seekBar = [[NSSliderTouchBarItem alloc] initWithIdentifier:itemId];
seekBar.slider.minValue = 0.0f;
seekBar.slider.maxValue = 1.0f;
seekBar.customizationLabel = @"Seek Bar";
auto *item = [[NSCustomTouchBarItem alloc] initWithIdentifier:itemId];
item.customizationLabel = @"Seek Bar";
auto *slider = [NSSlider sliderWithTarget:nil action:nil];
slider.minValue = 0.0f;
slider.maxValue = 1.0f;
slider.continuous = YES;
item.view = slider;
id block = [^{
// https://stackoverflow.com/a/45891017
@@ -227,7 +230,7 @@ NSSliderTouchBarItem *CreateTouchBarSlider(
touchesMatchingPhase:NSTouchPhaseEnded
inView:nil].count > 0;
Core::Sandbox::Instance().customEnterFromEventLoop([=] {
callback(touchUp, seekBar.slider.doubleValue, *lastDurationMs);
callback(touchUp, slider.doubleValue, *lastDurationMs);
});
} copy];
@@ -236,7 +239,6 @@ NSSliderTouchBarItem *CreateTouchBarSlider(
) | rpl::on_next([=](const Media::Player::TrackState &state) {
const auto stop = Media::Player::IsStoppedOrStopping(state.state);
const auto duration = double(stop ? 0 : state.length);
auto slider = seekBar.slider;
if (duration <= 0) {
slider.enabled = false;
slider.doubleValue = 0;
@@ -252,13 +254,13 @@ NSSliderTouchBarItem *CreateTouchBarSlider(
}
}, lifetime);
seekBar.target = block;
seekBar.action = @selector(invoke);
slider.target = block;
slider.action = @selector(invoke);
lifetime.add([=] {
[block release];
});
return seekBar;
return item;
}
NSCustomTouchBarItem *CreateTouchBarTrackPosition(