Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: ui/gfx/win/dpi.h

Issue 672673005: Remove IsHighDPIEnabled, move EnableHighDPISupport to only place it's used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dpi-cleanup-5
Patch Set: rebase-6 Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/gfx/screen_win.cc ('k') | ui/gfx/win/dpi.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_DPI_WIN_H_ 5 #ifndef UI_GFX_DPI_WIN_H_
6 #define UI_GFX_DPI_WIN_H_ 6 #define UI_GFX_DPI_WIN_H_
7 7
8 #include "ui/gfx/gfx_export.h" 8 #include "ui/gfx/gfx_export.h"
9 #include "ui/gfx/point.h" 9 #include "ui/gfx/point.h"
10 #include "ui/gfx/rect.h" 10 #include "ui/gfx/rect.h"
11 #include "ui/gfx/size.h" 11 #include "ui/gfx/size.h"
12 12
13 namespace gfx { 13 namespace gfx {
14 14
15 // Initialization of the scale factor that should be applied for rendering 15 // Initialization of the scale factor that should be applied for rendering
16 // in this process. Must be called before attempts to call any of the getter 16 // in this process. Must be called before attempts to call any of the getter
17 // methods below in this file, e.g. in the early toolkit/resource bundle setup. 17 // methods below in this file, e.g. in the early toolkit/resource bundle setup.
18 // This can be called multiple times during various tests, but subsequent calls 18 // This can be called multiple times during various tests, but subsequent calls
19 // have no effect. 19 // have no effect.
20 GFX_EXPORT void InitDeviceScaleFactor(float scale); 20 GFX_EXPORT void InitDeviceScaleFactor(float scale);
21 21
22 GFX_EXPORT Size GetDPI(); 22 GFX_EXPORT Size GetDPI();
23 23
24 // Gets the scale factor of the display. For example, if the display DPI is 24 // Gets the scale factor of the display. For example, if the display DPI is
25 // 96 then the scale factor is 1.0. 25 // 96 then the scale factor is 1.0.
26 GFX_EXPORT float GetDPIScale(); 26 GFX_EXPORT float GetDPIScale();
27 27
28 // Tests to see if the command line flag "--high-dpi-support" is set.
29 GFX_EXPORT bool IsHighDPIEnabled();
30
31 GFX_EXPORT void EnableHighDPISupport();
32
33 GFX_EXPORT void ForceHighDPISupportForTesting(float scale);
34
35 // TODO(kevers|girard): Move above methods into win namespace.
36
37 namespace win { 28 namespace win {
38 29
39 GFX_EXPORT Point ScreenToDIPPoint(const Point& pixel_point); 30 GFX_EXPORT Point ScreenToDIPPoint(const Point& pixel_point);
40 31
41 GFX_EXPORT Point DIPToScreenPoint(const Point& dip_point); 32 GFX_EXPORT Point DIPToScreenPoint(const Point& dip_point);
42 33
43 // WARNING: there is no right way to scale sizes and rects. The implementation 34 // WARNING: there is no right way to scale sizes and rects. The implementation
44 // of these strives to maintain a constant size by scaling the size independent 35 // of these strives to maintain a constant size by scaling the size independent
45 // of the origin. An alternative is to get the enclosing rect, which is the 36 // of the origin. An alternative is to get the enclosing rect, which is the
46 // right way for some situations. Understand which you need before blindly 37 // right way for some situations. Understand which you need before blindly
47 // assuming this is the right way. 38 // assuming this is the right way.
48 GFX_EXPORT Rect ScreenToDIPRect(const Rect& pixel_bounds); 39 GFX_EXPORT Rect ScreenToDIPRect(const Rect& pixel_bounds);
49 GFX_EXPORT Rect DIPToScreenRect(const Rect& dip_bounds); 40 GFX_EXPORT Rect DIPToScreenRect(const Rect& dip_bounds);
50 GFX_EXPORT Size ScreenToDIPSize(const Size& size_in_pixels); 41 GFX_EXPORT Size ScreenToDIPSize(const Size& size_in_pixels);
51 GFX_EXPORT Size DIPToScreenSize(const Size& dip_size); 42 GFX_EXPORT Size DIPToScreenSize(const Size& dip_size);
52 43
53 // Win32's GetSystemMetrics uses pixel measures. This function calls 44 // Win32's GetSystemMetrics uses pixel measures. This function calls
54 // GetSystemMetrics for the given |metric|, then converts the result to DIP. 45 // GetSystemMetrics for the given |metric|, then converts the result to DIP.
55 GFX_EXPORT int GetSystemMetricsInDIP(int metric); 46 GFX_EXPORT int GetSystemMetricsInDIP(int metric);
56 47
57 // Returns true if the global device scale factor has been explicitly set for
58 // the process.
59 GFX_EXPORT bool IsDeviceScaleFactorSet();
60
61 GFX_EXPORT extern const wchar_t kRegistryProfilePath[];
62 GFX_EXPORT extern const wchar_t kHighDPISupportW[];
63
64 } // namespace win 48 } // namespace win
65 } // namespace gfx 49 } // namespace gfx
66 50
67 #endif // UI_GFX_DPI_WIN_H_ 51 #endif // UI_GFX_DPI_WIN_H_
OLDNEW
« no previous file with comments | « ui/gfx/screen_win.cc ('k') | ui/gfx/win/dpi.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698