mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-04-18 23:27:09 +02:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
5b3ffc778d
7 changed files with 9 additions and 16 deletions
|
@ -178,7 +178,6 @@ void Provider::setSearchQuery(QString query) {
|
|||
void Provider::refreshViewer() {
|
||||
_viewerLifetime.destroy();
|
||||
const auto idForViewer = _aroundId;
|
||||
const auto session = &_peer->session();
|
||||
auto ids = (_tab == Tab::Saved)
|
||||
? Data::SavedStoriesIds(_peer, idForViewer, _idsLimit)
|
||||
: Data::ArchiveStoriesIds(_peer, idForViewer, _idsLimit);
|
||||
|
|
|
@ -172,8 +172,6 @@ ReactionView::ReactionView(
|
|||
}, lifetime());
|
||||
|
||||
const auto view = _fake.get();
|
||||
const auto item = view->data();
|
||||
|
||||
const auto entityData = [&] {
|
||||
const auto &id = _data.reaction;
|
||||
const auto reactions = &session->data().reactions();
|
||||
|
@ -227,9 +225,6 @@ void ReactionView::setupCustomChatStylePalette() {
|
|||
|
||||
void ReactionView::setAreaGeometry(QRect geometry) {
|
||||
_size = std::min(geometry.width(), geometry.height());
|
||||
const auto scaled = [&](float64 scale) {
|
||||
return int(base::SafeRound(scale * _size));
|
||||
};
|
||||
_bubble = _size * kSuggestedBubbleSize;
|
||||
_bigOffset = _bubble * kSuggestedTailBigOffset;
|
||||
_bigSize = _bubble * kSuggestedTailBigSize;
|
||||
|
|
|
@ -514,7 +514,7 @@ bool UnsafeShowOpenWith(const QString &filepath) {
|
|||
NSArray *appsPaths = [[NSFileManager defaultManager] URLsForDirectory:NSApplicationDirectory inDomains:NSLocalDomainMask];
|
||||
if ([appsPaths count]) [openPanel setDirectoryURL:[appsPaths firstObject]];
|
||||
[openPanel beginWithCompletionHandler:^(NSInteger result){
|
||||
if (result == NSFileHandlingPanelOKButton) {
|
||||
if (result == NSModalResponseOK) {
|
||||
if ([[openPanel URLs] count] > 0) {
|
||||
NSURL *app = [[openPanel URLs] objectAtIndex:0];
|
||||
NSString *path = [app path];
|
||||
|
|
|
@ -250,6 +250,7 @@ PRIVATE
|
|||
-Wno-deprecated-volatile
|
||||
-Wno-ambiguous-reversed-operator
|
||||
-Wno-deprecated-declarations
|
||||
-Wno-unqualified-std-cast-call
|
||||
)
|
||||
|
||||
remove_target_sources(lib_tgcalls ${tgcalls_loc}
|
||||
|
|
|
@ -25,13 +25,6 @@ init_target(lib_tgvoip_bundled)
|
|||
cmake_dependent_option(LIBTGVOIP_DISABLE_ALSA "Disable libtgvoip's ALSA backend." OFF LINUX ON)
|
||||
cmake_dependent_option(LIBTGVOIP_DISABLE_PULSEAUDIO "Disable libtgvoip's PulseAudio backend." OFF LINUX ON)
|
||||
|
||||
if (APPLE)
|
||||
target_compile_options(lib_tgvoip_bundled
|
||||
PRIVATE
|
||||
-Wno-unqualified-std-cast-call
|
||||
)
|
||||
endif()
|
||||
|
||||
set(tgvoip_loc ${third_party_loc}/libtgvoip)
|
||||
|
||||
nice_target_sources(lib_tgvoip_bundled ${tgvoip_loc}
|
||||
|
@ -135,6 +128,11 @@ PRIVATE
|
|||
TGVOIP_USE_DESKTOP_DSP
|
||||
)
|
||||
|
||||
target_compile_options_if_exists(lib_tgvoip_bundled
|
||||
PRIVATE
|
||||
-Wno-unqualified-std-cast-call
|
||||
)
|
||||
|
||||
if (WIN32)
|
||||
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||
target_compile_options(lib_tgvoip_bundled
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 145c9e617170eda5932c7d7064449fe262ee2a0a
|
||||
Subproject commit 805b851d69444ab3659b619566d186d0be83dcd9
|
|
@ -1 +1 @@
|
|||
Subproject commit a9994463f26d6924dc37887b11b37c88f1a08d17
|
||||
Subproject commit cea8958ca2007192dbd6ce14967f74484d1fcc6f
|
Loading…
Add table
Reference in a new issue