diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 13:31:06 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 13:31:06 +0000 |
| commit | db8518baeb30f5874f69bba07175295da958c834 (patch) | |
| tree | 506d6e4e575000f59de377020bba0151e64daef1 /ui | |
| parent | c487b7afe1c31c3cb75858238d95fd05db3f1b52 (diff) | |
| download | chromium_src-db8518baeb30f5874f69bba07175295da958c834.zip chromium_src-db8518baeb30f5874f69bba07175295da958c834.tar.gz chromium_src-db8518baeb30f5874f69bba07175295da958c834.tar.bz2 | |
Set the scale factor for the display on Windows when in high-DPI mode.
BUG=149881
Review URL: https://chromiumcodereview.appspot.com/12398019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/display.cc | 2 | ||||
| -rw-r--r-- | ui/gfx/screen_win.cc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ui/gfx/display.cc b/ui/gfx/display.cc index 73f33b3..4ff94bf 100644 --- a/ui/gfx/display.cc +++ b/ui/gfx/display.cc @@ -9,7 +9,6 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "ui/base/ui_base_switches.h" -#include "ui/base/win/dpi.h" #include "ui/gfx/insets.h" #include "ui/gfx/point_f.h" #include "ui/gfx/size_conversions.h" @@ -35,6 +34,7 @@ float GetForcedDeviceScaleFactorImpl() { const int64 kInvalidDisplayIDForCompileTimeInit = -1; int64 internal_display_id_ = kInvalidDisplayIDForCompileTimeInit; + } // namespace const int64 Display::kInvalidDisplayID = kInvalidDisplayIDForCompileTimeInit; diff --git a/ui/gfx/screen_win.cc b/ui/gfx/screen_win.cc index f17fbc4..3199baa 100644 --- a/ui/gfx/screen_win.cc +++ b/ui/gfx/screen_win.cc @@ -7,6 +7,7 @@ #include <windows.h> #include "base/logging.h" +#include "ui/base/win/dpi.h" #include "ui/gfx/display.h" namespace { @@ -20,8 +21,10 @@ MONITORINFO GetMonitorInfoForMonitor(HMONITOR monitor) { gfx::Display GetDisplay(MONITORINFO& monitor_info) { // TODO(oshima): Implement ID and Observer. - gfx::Display display(0, gfx::Rect(monitor_info.rcMonitor)); + gfx::Rect bounds = gfx::Rect(monitor_info.rcMonitor); + gfx::Display display(0, bounds); display.set_work_area(gfx::Rect(monitor_info.rcWork)); + display.SetScaleAndBounds(ui::win::GetDeviceScaleFactor(), bounds); return display; } |