added a way to get the scalling factor from any widget

fixed typos
added GL_GLEXT_PROTOTYPES define for linux users

include/ngl.h

@@ -496,6 +496,7 @@ typedef wchar_t nglUChar;
 
 #  elif !defined _MINUI3_
 
+#define GL_GLEXT_PROTOTYPES
 #    include <GL/gl.h>
 //#    include <GL/glu.h>
 #    include "nui_GL/glext.h"

include/nuiMainWindow.h

@@ -188,6 +188,9 @@ class nuiMainWindow :  public nuiTopLevel
   virtual bool OnMouseMove   (nglMouseInfo& rInfo);
   virtual bool OnMouseCanceled(nglMouseInfo& rInfo);
   virtual bool OnRotation    (uint Angle);
+  virtual float GetScale() const;
+  virtual float GetScaleInv() const;
+
   //@}
 
   nuiEventSink<nuiMainWindow> mMainWinSink;

include/nuiTopLevel.h

@@ -167,6 +167,9 @@ class nuiTopLevel : public nuiSimpleContainer
   virtual const std::map<nglTouchId, nglMouseInfo>& GetMouseStates() const;
   virtual nuiSize GetStatusBarSize() const;
 
+  virtual float GetScale() const;
+  virtual float GetScaleInv() const;
+
 protected:
   void Exit();
   void SetDrawContext(nuiDrawContext* pDrawContext);

include/nuiWidget.h

@@ -510,6 +510,8 @@ class nuiWidget : public nuiObject
   bool GetNeedSelfRedraw() const { return mNeedSelfRedraw; }
   bool GetNeedIdealRect() const { return mNeedIdealRect; }
 
+  virtual float GetScale() const; ///< Return current HDPI scaling
+  virtual float GetScaleInv() const; ///< Return 1.0/GetScale()
   //@}
 
   NUI_GETSET(bool, AutoUpdateLayout);

nui3.xcodeproj/project.pbxproj

@@ -12246,6 +12246,7 @@
 					XP_UNIX,
 					HAVE_FT_FACE_GETCHARVARIANTINDEX,
 					AVMPLUS_IA32,
+					NDEBUG,
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[arch=ppc]" = (
 					NGL_STATIC_BUILD,
@@ -12258,6 +12259,7 @@
 					XP_UNIX,
 					HAVE_FT_FACE_GETCHARVARIANTINDEX,
 					AVMPLUS_PPC,
+					NDEBUG,
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64]" = (
 					NGL_STATIC_BUILD,
@@ -12270,6 +12272,7 @@
 					XP_UNIX,
 					HAVE_FT_FACE_GETCHARVARIANTINDEX,
 					AVMPLUS_AMD64,
+					NDEBUG,
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=*]" = (
 					NGL_STATIC_BUILD,
@@ -12282,6 +12285,7 @@
 					XP_UNIX,
 					HAVE_FT_FACE_GETCHARVARIANTINDEX,
 					AVMPLUS_ARM,
+					NDEBUG,
 				);
 				"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = (
 					NGL_STATIC_BUILD,
@@ -12295,6 +12299,7 @@
 					XP_UNIX,
 					HAVE_FT_FACE_GETCHARVARIANTINDEX,
 					AVMPLUS_IA32,
+					NDEBUG,
 				);
 				GCC_THREADSAFE_STATICS = NO;
 				GCC_UNROLL_LOOPS = YES;

src/Layout/nuiScrollView.cpp

@@ -290,9 +290,11 @@ bool nuiScrollView::SetRect(const nuiRect& rRect)
     mXOffset = XOffset;
     mYOffset = YOffset;
   }
+  const float pixel_size = GetScale();
+  const float inv_pixel_size = GetScaleInv();
 
-  XOffset = (nuiSize)ToNearest(XOffset);
-  YOffset = (nuiSize)ToNearest(YOffset);
+  XOffset = (nuiSize)ToNearest(XOffset * pixel_size) * inv_pixel_size;
+  YOffset = (nuiSize)ToNearest(YOffset * pixel_size) * inv_pixel_size;
 
   GetIdealRect();
   nuiRect rIdealRect(mChildrenUnionRect); ///< needed because GetIdealRect may return a UserRect

src/Renderers/nuiGL2Painter.cpp

@@ -967,7 +967,7 @@ void nuiGL2Painter::SetVertexBuffersPointers(const nuiRenderArray& rArray, Rende
 
   if (bound % 10000 == 0)
   {
-    NGL_OUT("VAO/VBO %lld created %lld bound (%f cache hit)\n", created, bound, (float)bound / (float)created);
+    NGL_DEBUG(NGL_OUT("VAO/VBO %lld created %lld bound (%f cache hit)\n", created, bound, (float)bound / (float)created););
   }
 
   NGL_ASSERT(it != rInfo.mVAOs.end());

src/WidgetTree/nuiMainWindow.cpp

@@ -1351,4 +1351,14 @@ void nuiMainWindow::DestroyAllWindows()
   NGL_ASSERT(mpWindows.empty());
 }
 
+float nuiMainWindow::GetScale() const
+{
+  return mpNGLWindow->GetScale();
+}
+
+float nuiMainWindow::GetScaleInv() const
+{
+  return mpNGLWindow->GetScaleInv();
+}
+
 

src/WidgetTree/nuiTopLevel.cpp

@@ -2593,7 +2593,7 @@ void nuiTopLevel::SetTabBackward(nuiWidget* pSource, nuiWidget* pDestination, bo
   // Add the relation to the reverse table (for quick removal when the pointed widget will die)
   mTabBackwardRev[pDestination].insert(pSource);
 
-  // If needed, added the bacward relation too (so that Tab and then shift-Tab goes back to the original source)
+  // If needed, added the backward relation too (so that Tab and then shift-Tab goes back to the original source)
   if (AutoReverse)
   {
     SetTabForward(pDestination, pSource, false);
@@ -2705,5 +2705,13 @@ void nuiTopLevel::DumpGrabMap(int line) const
 #endif
 }
 
+float nuiTopLevel::GetScale() const
+{
+  return nuiGetScaleFactor();
+}
 
+float nuiTopLevel::GetScaleInv() const
+{
+  return nuiGetInvScaleFactor();
+}
 

src/WidgetTree/nuiWidget.cpp

@@ -2058,7 +2058,7 @@ bool nuiWidget::HasGrab(nglTouchId TouchId)
 
 bool nuiWidget::StealMouseEvent(const nglMouseInfo& rInfo)
 {
-  NGL_OUT("%s/%s (%p) Preempting mouse from existing grabber!\n", GetObjectClass().GetChars(), GetObjectName().GetChars(), this);
+  NGL_DEBUG(if (GetDebug()) NGL_LOG("widget", NGL_LOG_INFO, "%s/%s (%p) Preempting mouse from existing grabber!\n", GetObjectClass().GetChars(), GetObjectName().GetChars(), this););
   nuiTopLevel* pTop = GetTopLevel();
   NGL_ASSERT(pTop);
   return pTop->StealMouseEvent(this, rInfo);
@@ -5169,3 +5169,20 @@ void nuiWidget::ClearDefaultDecorations()
 {
   mDefaultDecorations.clear();
 }
+
+float nuiWidget::GetScale() const
+{
+  nuiTopLevel* pTop = GetTopLevel();
+  if (pTop)
+    return pTop->GetScale();
+  return nuiGetScaleFactor();
+}
+
+float nuiWidget::GetScaleInv() const
+{
+  nuiTopLevel* pTop = GetTopLevel();
+  if (pTop)
+    return pTop->GetScaleInv();
+  return nuiGetInvScaleFactor();
+}
+