mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

add zoom behaviour code from chromium and make pdf viewer use manual zoom behaviour to match chromium

Browse source
This commit is contained in:
Heilig Benedek 2017-06-08 02:13:49 +02:00
parent a47fe715d1
commit 0f4341da42
4 changed files with 210 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

40
atom/browser/web_contents_zoom_controller.h
View file

@ -28,6 +28,26 @@ class WebContentsZoomController
protected:
virtual ~Observer() {}
};
// Defines how zoom changes are handled.
enum ZoomMode {
// Results in default zoom behavior, i.e. zoom changes are handled
// automatically and on a per-origin basis, meaning that other tabs
// navigated to the same origin will also zoom.
ZOOM_MODE_DEFAULT,
// Results in zoom changes being handled automatically, but on a per-tab
// basis. Tabs in this zoom mode will not be affected by zoom changes in
// other tabs, and vice versa.
ZOOM_MODE_ISOLATED,
// Overrides the automatic handling of zoom changes. The |onZoomChange|
// event will still be dispatched, but the page will not actually be zoomed.
// These zoom changes can be handled manually by listening for the
// |onZoomChange| event. Zooming in this mode is also on a per-tab basis.
ZOOM_MODE_MANUAL,
// Disables all zooming in this tab. The tab will revert to the default
// zoom level, and all attempted zoom changes will be ignored.
ZOOM_MODE_DISABLED,
};
explicit WebContentsZoomController(content::WebContents* web_contents);
~WebContentsZoomController() override;
@ -45,6 +65,20 @@ class WebContentsZoomController
void SetTemporaryZoomLevel(double level);
bool UsesTemporaryZoomLevel();
// Sets the zoom mode, which defines zoom behavior (see enum ZoomMode).
void SetZoomMode(ZoomMode zoom_mode);
void ResetZoomModeOnNavigationIfNeeded(const GURL& url);
ZoomMode zoom_mode() const { return zoom_mode_; }
// Convenience method to get default zoom level. Implemented here for
// inlining.
double GetDefaultZoomLevel() const {
return content::HostZoomMap::GetForWebContents(web_contents())
->GetDefaultZoomLevel();
}
protected:
// content::WebContentsObserver:
void DidFinishNavigation(content::NavigationHandle* handle) override;
@ -58,6 +92,12 @@ class WebContentsZoomController
// Called after a navigation has committed to set default zoom factor.
void SetZoomFactorOnNavigationIfNeeded(const GURL& url);
// The current zoom mode.
ZoomMode zoom_mode_;
// Current zoom level.
double zoom_level_;
// kZoomFactor.
double default_zoom_factor_;
double temporary_zoom_level_;