OLD | NEW |
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. Note that this is the "desktop" scale, which |
| 26 // may be differnt than GetModernUIScale(). |
26 GFX_EXPORT float GetDPIScale(); | 27 GFX_EXPORT float GetDPIScale(); |
27 | 28 |
| 29 // Gets the scale factor of the modern (metro) UI display. Returns 1.0 for |
| 30 // unscaled or "not running on win8+" |
| 31 GFX_EXPORT float GetModernUIScale(); |
| 32 |
28 // Tests to see if the command line flag "--high-dpi-support" is set. | 33 // Tests to see if the command line flag "--high-dpi-support" is set. |
29 GFX_EXPORT bool IsHighDPIEnabled(); | 34 GFX_EXPORT bool IsHighDPIEnabled(); |
30 | 35 |
31 GFX_EXPORT bool IsInHighDPIMode(); | 36 GFX_EXPORT bool IsInHighDPIMode(); |
32 | 37 |
33 GFX_EXPORT void EnableHighDPISupport(); | 38 GFX_EXPORT void EnableHighDPISupport(); |
34 | 39 |
35 // TODO(kevers|girard): Move above methods into win namespace. | 40 // TODO(kevers|girard): Move above methods into win namespace. |
36 | 41 |
37 namespace win { | 42 namespace win { |
(...skipping 26 matching lines...) Expand all Loading... |
64 | 69 |
65 // Win7 and Win8 send touch events scaled according to the current DPI | 70 // Win7 and Win8 send touch events scaled according to the current DPI |
66 // scaling. Win8.1 corrects this, and sends touch events in DPI units. | 71 // scaling. Win8.1 corrects this, and sends touch events in DPI units. |
67 // This function returns the appropriate scaling factor for touch events. | 72 // This function returns the appropriate scaling factor for touch events. |
68 GFX_EXPORT double GetUndocumentedDPITouchScale(); | 73 GFX_EXPORT double GetUndocumentedDPITouchScale(); |
69 | 74 |
70 } // namespace win | 75 } // namespace win |
71 } // namespace gfx | 76 } // namespace gfx |
72 | 77 |
73 #endif // UI_GFX_DPI_WIN_H_ | 78 #endif // UI_GFX_DPI_WIN_H_ |
OLD | NEW |