Browse Source

Default desktop scaling for win32.

tags/2021-05-28
jules 12 years ago
parent
commit
cbe2777656
7 changed files with 25 additions and 2 deletions
  1. +1
    -1
      modules/juce_gui_basics/components/juce_Desktop.cpp
  2. +2
    -0
      modules/juce_gui_basics/components/juce_Desktop.h
  3. +5
    -0
      modules/juce_gui_basics/native/juce_android_Windowing.cpp
  4. +5
    -0
      modules/juce_gui_basics/native/juce_ios_Windowing.mm
  5. +5
    -0
      modules/juce_gui_basics/native/juce_linux_Windowing.cpp
  6. +5
    -0
      modules/juce_gui_basics/native/juce_mac_Windowing.mm
  7. +2
    -1
      modules/juce_gui_basics/native/juce_win32_Windowing.cpp

+ 1
- 1
modules/juce_gui_basics/components/juce_Desktop.cpp View File

@@ -26,7 +26,7 @@ Desktop::Desktop()
: mouseClickCounter (0), mouseWheelCounter (0), : mouseClickCounter (0), mouseWheelCounter (0),
kioskModeComponent (nullptr), kioskModeComponent (nullptr),
allowedOrientations (allOrientations), allowedOrientations (allOrientations),
masterScaleFactor (1.0f)
masterScaleFactor ((float) getDefaultMasterScale())
{ {
displays = new Displays (*this); displays = new Displays (*this);
addMouseInputSource(); addMouseInputSource();


+ 2
- 0
modules/juce_gui_basics/components/juce_Desktop.h View File

@@ -448,6 +448,8 @@ private:
void triggerFocusCallback(); void triggerFocusCallback();
void handleAsyncUpdate() override; void handleAsyncUpdate() override;
static double getDefaultMasterScale();
Desktop(); Desktop();
~Desktop(); ~Desktop();


+ 5
- 0
modules/juce_gui_basics/native/juce_android_Windowing.cpp View File

@@ -572,6 +572,11 @@ bool Desktop::canUseSemiTransparentWindows() noexcept
return true; return true;
} }
double Desktop::getDefaultMasterScale()
{
return 1.0;
}
Desktop::DisplayOrientation Desktop::getCurrentOrientation() const Desktop::DisplayOrientation Desktop::getCurrentOrientation() const
{ {
// TODO // TODO


+ 5
- 0
modules/juce_gui_basics/native/juce_ios_Windowing.mm View File

@@ -297,6 +297,11 @@ void MouseInputSource::setRawMousePosition (Point<int>)
{ {
} }
double Desktop::getDefaultMasterScale()
{
return 1.0;
}
Desktop::DisplayOrientation Desktop::getCurrentOrientation() const Desktop::DisplayOrientation Desktop::getCurrentOrientation() const
{ {
return Orientations::convertToJuce ([[UIApplication sharedApplication] statusBarOrientation]); return Orientations::convertToJuce ([[UIApplication sharedApplication] statusBarOrientation]);


+ 5
- 0
modules/juce_gui_basics/native/juce_linux_Windowing.cpp View File

@@ -3124,6 +3124,11 @@ void MouseInputSource::setRawMousePosition (Point<int> newPosition)
XWarpPointer (display, None, root, 0, 0, 0, 0, newPosition.getX(), newPosition.getY()); XWarpPointer (display, None, root, 0, 0, 0, 0, newPosition.getX(), newPosition.getY());
} }
double Desktop::getDefaultMasterScale()
{
return 1.0;
}
Desktop::DisplayOrientation Desktop::getCurrentOrientation() const Desktop::DisplayOrientation Desktop::getCurrentOrientation() const
{ {
return upright; return upright;


+ 5
- 0
modules/juce_gui_basics/native/juce_mac_Windowing.mm View File

@@ -226,6 +226,11 @@ void MouseInputSource::setRawMousePosition (Point<int> newPosition)
CGAssociateMouseAndMouseCursorPosition (true); CGAssociateMouseAndMouseCursorPosition (true);
} }
double Desktop::getDefaultMasterScale()
{
return 1.0;
}
Desktop::DisplayOrientation Desktop::getCurrentOrientation() const Desktop::DisplayOrientation Desktop::getCurrentOrientation() const
{ {
return upright; return upright;


+ 2
- 1
modules/juce_gui_basics/native/juce_win32_Windowing.cpp View File

@@ -141,6 +141,7 @@ static inline Rectangle<int> rectangleFromRECT (const RECT& r) noexcept
return Rectangle<int>::leftTopRightBottom ((int) r.left, (int) r.top, (int) r.right, (int) r.bottom); return Rectangle<int>::leftTopRightBottom ((int) r.left, (int) r.top, (int) r.right, (int) r.bottom);
} }
//==============================================================================
static void setDPIAwareness() static void setDPIAwareness()
{ {
if (JUCEApplication::isStandaloneApp()) if (JUCEApplication::isStandaloneApp())
@@ -162,7 +163,7 @@ inline double getDPI()
return dpi; return dpi;
} }
inline double getDisplayScale()
double Desktop::getDefaultMasterScale()
{ {
return getDPI() / 96.0; return getDPI() / 96.0;
} }


Loading…
Cancel
Save