Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-09-18 02:15:20 -03:00
12 changed files with 141 additions and 30 deletions
+24
View File
@@ -672,6 +672,30 @@ double Window::getPixelScale() const
return scale;
}
double Window::toPixels(double x) const
{
return x * getPixelScale();
}
void Window::toPixels(double wx, double wy, double &px, double &py) const
{
double scale = getPixelScale();
px = wx * scale;
py = wy * scale;
}
double Window::fromPixels(double x) const
{
return x / getPixelScale();
}
void Window::fromPixels(double px, double py, double &wx, double &wy) const
{
double scale = getPixelScale();
wx = px / scale;
wy = py / scale;
}
const void *Window::getHandle() const
{
return window;