Merge tag 'v6.7.2' into dev

Telegram/SourceFiles/iv/iv_controller.cpp

@@ -110,7 +110,7 @@ public:
 		resetLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 		reset->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 		reset->setClickedCallback([this] {
-			_delegate->ivSetZoom(kDefaultZoom);
+			_delegate->ivSetZoom(0);
 		});
 		reset->show();
 		const auto plus = Ui::CreateSimpleCircleButton(
@@ -708,7 +708,7 @@ void Controller::createWebview(const Webview::StorageId &storageId) {
 					_delegate->ivSetZoom(_delegate->ivZoom() - kZoomStep);
 					return base::EventFilterResult::Cancel;
 				} else if (event->key() == Qt::Key_0) {
-					_delegate->ivSetZoom(kDefaultZoom);
+					_delegate->ivSetZoom(0);
 					return base::EventFilterResult::Cancel;
 				}
 			}
@@ -1025,7 +1025,7 @@ void Controller::processKey(const QString &key, const QString &modifier) {
 	} else if (key == u"q"_q && modifier == ctrl) {
 		quit();
 	} else if (key == u"0"_q && modifier == ctrl) {
-		_delegate->ivSetZoom(kDefaultZoom);
+		_delegate->ivSetZoom(0);
 	}
 }
 

Telegram/SourceFiles/iv/iv_data.cpp

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "iv/iv_data.h"
 
 #include "iv/iv_prepare.h"
-#include "webview/webview_interface.h"
+#include "core/cached_webview_availability.h"
 
 #include <QtCore/QRegularExpression>
 #include <QtCore/QUrl>
@@ -102,12 +102,9 @@ QString SiteNameFromUrl(const QString &url) {
 }
 
 bool ShowButton() {
-	static const auto Supported = [&] {
-		const auto availability = Webview::Availability();
-		return availability.customSchemeRequests
-			&& availability.customRangeRequests;
-	}();
-	return Supported;
+	const auto &availability = Core::CachedWebviewAvailability();
+	return availability.customSchemeRequests
+		&& availability.customRangeRequests;
 }
 
 void RecordShowFailure() {

Telegram/SourceFiles/iv/iv_instance.cpp

@@ -848,6 +848,10 @@ void Instance::show(
 		Core::App().hideMediaView();
 	}
 
+	if (Core::App().settings().normalizeIvZoom()) {
+		Core::App().saveSettingsDelayed();
+	}
+
 	const auto guard = gsl::finally([&] {
 		requestFull(session, data->id());
 	});