Merge lp:~unity-team/nux/nux-reset-projection-matrix into lp:nux/2.0

[Jay Taoko]

* Reset projection matrix when restoring framebuffer.

[lp:~unity-team/nux/nux-reset-projection-matrix]

536. By Andrea Azzarone on 2012-01-17

This branch is a partial fix for the bug #893670. It requires also:
- https://code.launchpad.net/~andyrock/compiz-core/scale-left-padding/+merge/88622
- https://code.launchpad.net/~andyrock/unity/scale-left-padding/+merge/88625

But you can test it setting the spacing option in the scale ccsm panel to 100.. Fixes: https://bugs.launchpad.net/bugs/893670. Appoved by Mirco Müller.

537. By Andrea Azzarone on 2012-01-19

Add support for the _COMPIZ_NET_OVERLAY_STRUTS property.. Fixes: . Appoved by Sam Spilsbury.

538. By Andrea Azzarone on 2012-01-19

Changes the cursor when the mouse pointer is over the text entry area.. Fixes: https://bugs.launchpad.net/bugs/737719, https://bugs.launchpad.net/bugs/849175. Appoved by Jay Taoko.

[Mirco Müller (macslow)]

Looking good.

review: Approve

[lp:~unity-team/nux/nux-reset-projection-matrix]

539. By Jay Taoko on 2012-01-20

* Updated ABI version

540. By Jay Taoko on 2012-01-20

* Merged with Nux trunk

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-01-06 18:43:37 +0000
+++ Nux/WindowCompositor.cpp	2012-01-20 19:36:24 +0000
@@ -39,7 +39,7 @@
   logging::Logger logger("nux.window");
 }
 
-  WindowCompositor::WindowCompositor(WindowThread *window_thread)
+  WindowCompositor::WindowCompositor(WindowThread* window_thread)
   : window_thread_(window_thread)  
   , reference_fbo_(0)
   {
@@ -123,10 +123,10 @@
     return m_SelectedWindow.GetPointer();
   }
 
-  WindowCompositor::RenderTargetTextures &WindowCompositor::GetWindowBuffer(BaseWindow *window)
+  WindowCompositor::RenderTargetTextures& WindowCompositor::GetWindowBuffer(BaseWindow* window)
   {
     static RenderTargetTextures invalid;
-    std::map< BaseWindow*, RenderTargetTextures >::iterator it = _window_to_texture_map.find(window);
+    std::map< BaseWindow*, RenderTargetTextures>::iterator it = _window_to_texture_map.find(window);
 
     if (it != _window_to_texture_map.end())
     {
@@ -136,7 +136,7 @@
     return invalid;
   }
 
-  void WindowCompositor::RegisterWindow(BaseWindow *window)
+  void WindowCompositor::RegisterWindow(BaseWindow* window)
   {
     LOG_DEBUG_BLOCK(logger);
     if (!window)
@@ -222,7 +222,7 @@
     {
       if ((*window_it).IsValid() && (*window_it)->IsVisible())
       {
-        InputArea *area = static_cast<InputArea*>((*window_it)->FindAreaUnderMouse(mouse_position, event_type));
+        InputArea* area = static_cast<InputArea*>((*window_it)->FindAreaUnderMouse(mouse_position, event_type));
         if (area)
         {
           *area_under_mouse_pointer = area;
@@ -307,12 +307,12 @@
     }
   }
 
-  void WindowCompositor::DndEventCycle(Event &event)
+  void WindowCompositor::DndEventCycle(Event& event)
   {
     if (event.type == NUX_DND_MOVE)
     {
-      InputArea *hit_area = NULL;
-      BaseWindow *hit_base_window = NULL;
+      InputArea* hit_area = NULL;
+      BaseWindow* hit_base_window = NULL;
 
       GetAreaUnderMouse(Point(event.x, event.y), event.type, &hit_area, &hit_base_window);
 
@@ -336,13 +336,13 @@
     }
     else if (event.type == NUX_DND_DROP)
     {
-      InputArea *current_dnd_area = GetDnDArea();
+      InputArea* current_dnd_area = GetDnDArea();
       if (current_dnd_area->GetGeometry().IsPointInside(event.x - event.x_root, event.y - event.y_root))
         current_dnd_area->HandleDndDrop(event);
     }
   }
 
-  void WindowCompositor::MouseEventCycle(Event &event)
+  void WindowCompositor::MouseEventCycle(Event& event)
   {
     // mouse_owner_area_: the view that has the mouse down
     // mouse_over_area_: the view that is directly below the mouse pointer
@@ -370,7 +370,7 @@
         BaseWindow* hit_base_window = NULL; // The BaseWindow below the mouse pointer.
 
         // Look for the area below the mouse pointer in the BaseWindow.
-        Area *pointer_grab_area = GetPointerGrabArea();
+        Area* pointer_grab_area = GetPointerGrabArea();
         if (pointer_grab_area)
         {
           // If there is a pending mouse pointer grab, test that area only
@@ -890,7 +890,7 @@
     }
   }
 
-  void WindowCompositor::KeyboardEventCycle(Event &event)
+  void WindowCompositor::KeyboardEventCycle(Event& event)
   {
     InputArea* keyboard_event_grab_view = GetKeyboardGrabArea();
 
@@ -1022,7 +1022,7 @@
   }
 
   // NUXTODO: rename as EventCycle
-  void WindowCompositor::ProcessEvent(Event &event)
+  void WindowCompositor::ProcessEvent(Event& event)
   {
     inside_event_cycle_ = true;
     if (_enable_nux_new_event_architecture)
@@ -1085,7 +1085,7 @@
   }
 
   //! Push a floating view at the top of the stack.
-  void WindowCompositor::PushToFront(BaseWindow *window)
+  void WindowCompositor::PushToFront(BaseWindow* window)
   {
     if (window == 0)
       return;
@@ -1102,7 +1102,7 @@
   }
 
   //! Push a floating view at the bottom of the stack.
-  void WindowCompositor::PushToBack(BaseWindow *window)
+  void WindowCompositor::PushToBack(BaseWindow* window)
   {
     if (window == 0)
       return;
@@ -1122,7 +1122,7 @@
   }
 
   //! Push a floating view just above another floating view.
-  void WindowCompositor::PushHigher(BaseWindow *top_floating_view, BaseWindow *bottom_floating_view, bool strict)
+  void WindowCompositor::PushHigher(BaseWindow* top_floating_view, BaseWindow* bottom_floating_view, bool strict)
   {
     NUX_RETURN_IF_NULL(bottom_floating_view);
     NUX_RETURN_IF_NULL(top_floating_view);
@@ -1168,7 +1168,7 @@
     EnsureAlwaysOnFrontWindow();
   }
 
-  void WindowCompositor::SetAlwaysOnFrontWindow(BaseWindow *window)
+  void WindowCompositor::SetAlwaysOnFrontWindow(BaseWindow* window)
   {
     _always_on_front_window = ObjectWeakPtr<BaseWindow> (window);
 
@@ -1194,7 +1194,7 @@
     }
   }
 
-  InputArea *WindowCompositor::GetExclusiveInputArea()
+  InputArea* WindowCompositor::GetExclusiveInputArea()
   {
     return _exclusive_input_area;
   }
@@ -1293,7 +1293,7 @@
       window_thread_->GetGraphicsEngine().EmptyClippingRegion();
     }
 
-    std::list<MenuPage *>::reverse_iterator rev_it_menu;
+    std::list<MenuPage*>::reverse_iterator rev_it_menu;
 
     for (rev_it_menu = _menu_chain->rbegin(); rev_it_menu != _menu_chain->rend( ); rev_it_menu++)
     {
@@ -1358,7 +1358,7 @@
     //GetGraphicsDisplay()->GetGraphicsEngine()->SetContext(0, 0, buffer_width, buffer_height);
   }
 
-  void WindowCompositor::RenderTopViewContent(BaseWindow *window, bool force_draw)
+  void WindowCompositor::RenderTopViewContent(BaseWindow* window, bool force_draw)
   {
     GetPainter().EmptyBackgroundStack();
     SetProcessingTopView(window);
@@ -1632,7 +1632,7 @@
     }
   }
 
-  void WindowCompositor::AddMenu(MenuPage *menu, BaseWindow *window, bool OverrideCurrentMenuChain)
+  void WindowCompositor::AddMenu(MenuPage* menu, BaseWindow* window, bool OverrideCurrentMenuChain)
   {
     if (_menu_chain->size() == 0)
     {
@@ -1675,9 +1675,9 @@
   }
 
   // Be careful never call this function while you are iterating through the elements of _menu_chain.
-  void WindowCompositor::RemoveMenu(MenuPage *menu)
+  void WindowCompositor::RemoveMenu(MenuPage* menu)
   {
-    std::list<MenuPage *>::iterator it = find(_menu_chain->begin(), _menu_chain->end(), menu);
+    std::list<MenuPage*>::iterator it = find(_menu_chain->begin(), _menu_chain->end(), menu);
 
     if (it == _menu_chain->end())
     {
@@ -1701,7 +1701,7 @@
     if (_menu_chain->size() == 0)
       return;
 
-    std::list<MenuPage *>::iterator menu_it = _menu_chain->begin();
+    std::list<MenuPage*>::iterator menu_it = _menu_chain->begin();
 
     while (menu_it != _menu_chain->end())
     {
@@ -1724,18 +1724,18 @@
     }
   }
 
-  void WindowCompositor::SetWidgetDrawingOverlay(InputArea *ic, BaseWindow* OverlayWindow)
+  void WindowCompositor::SetWidgetDrawingOverlay(InputArea* ic, BaseWindow* OverlayWindow)
   {
     OverlayDrawingCommand = ic;
     m_OverlayWindow = OverlayWindow;
   }
 
-  InputArea *WindowCompositor::GetWidgetDrawingOverlay()
+  InputArea* WindowCompositor::GetWidgetDrawingOverlay()
   {
     return OverlayDrawingCommand;
   }
 
-  void WindowCompositor::SetTooltip(InputArea* TooltipArea, const char *TooltipText, int x, int y)
+  void WindowCompositor::SetTooltip(InputArea* TooltipArea, const char* TooltipText, int x, int y)
   {
     _tooltip_window = GetProcessingTopView();
     m_TooltipArea = TooltipArea;
@@ -1816,7 +1816,7 @@
     }
   }
   
-  void WindowCompositor::SetKeyFocusArea(InputArea *area)
+  void WindowCompositor::SetKeyFocusArea(InputArea* area)
   {
     InputArea* keyboard_grab_area = GetKeyboardGrabArea();
 
@@ -1898,7 +1898,7 @@
     return key_focus_area_;
   }
 
-  void WindowCompositor::SetBackgroundPaintLayer(AbstractPaintLayer *bkg)
+  void WindowCompositor::SetBackgroundPaintLayer(AbstractPaintLayer* bkg)
   {
     NUX_SAFE_DELETE(m_Background);
     m_Background = bkg->Clone();
@@ -1954,7 +1954,7 @@
 
   void WindowCompositor::RestoreRenderingSurface()
   {
-    BaseWindow *top_view = GetProcessingTopView();
+    BaseWindow* top_view = GetProcessingTopView();
 
     if (top_view && inside_rendering_cycle_)
     {
@@ -2004,7 +2004,7 @@
     }
   }
 
-  void* WindowCompositor::GetBackupTextureData(BaseWindow *base_window, int &width, int &height, int &format)
+  void* WindowCompositor::GetBackupTextureData(BaseWindow* base_window, int& width, int& height, int& format)
   {
     width = height = format = 0;
 

=== modified file 'Nux/WindowCompositor.h'
--- Nux/WindowCompositor.h	2012-01-05 04:00:19 +0000
+++ Nux/WindowCompositor.h	2012-01-20 19:36:24 +0000
@@ -47,7 +47,7 @@
   public:
     typedef ObjectWeakPtr<BaseWindow> WeakBaseWindowPtr;
 
-    WindowCompositor(WindowThread *window_thread);
+    WindowCompositor(WindowThread* window_thread);
     ~WindowCompositor();
 
     //! Get the Geometry of the tooltip based on the BaseWindow that initiated it.
@@ -61,11 +61,11 @@
 //     bool MouseMove(Point pt);
 //     bool MouseUp(Point pt);
 
-    void ProcessEvent(Event &event);
+    void ProcessEvent(Event& event);
 
     //====================================
-    void MouseEventCycle(Event &event);
-    void DndEventCycle(Event &event);
+    void MouseEventCycle(Event& event);
+    void DndEventCycle(Event& event);
     bool _enable_nux_new_event_architecture;
 
 
@@ -75,9 +75,9 @@
     //! Get Mouse position relative to the top left corner of the window.
     Point GetMousePosition();
     
-    void KeyboardEventCycle(Event &event);
+    void KeyboardEventCycle(Event& event);
 
-    void MenuEventCycle(Event &event);
+    void MenuEventCycle(Event& event);
     MenuPage* _mouse_owner_menu_page;
     MenuPage* _mouse_over_menu_page;
     bool      _starting_menu_event_cycle;
@@ -196,23 +196,22 @@
     {
       return m_FrameBufferObject;
     }
+    
     ObjectPtr<IOpenGLFrameBufferObject> m_FrameBufferObject;
 
-    ObjectPtr<IOpenGLBaseTexture> GetScreenBlurTexture();
-
     void StartModalWindow(ObjectWeakPtr<BaseWindow>);
     void StopModalWindow(ObjectWeakPtr<BaseWindow>);
 
-    void AddMenu(MenuPage* menu, BaseWindow *window, bool OverrideCurrentMenuChain = true);
+    void AddMenu(MenuPage* menu, BaseWindow* window, bool OverrideCurrentMenuChain = true);
     void RemoveMenu(MenuPage* menu);
     void CleanMenu();
 
     void PushModalWindow(ObjectWeakPtr<BaseWindow> window);
 
-    void SetWidgetDrawingOverlay(InputArea *ic, BaseWindow *OverlayWindow);
-    InputArea *GetWidgetDrawingOverlay();
+    void SetWidgetDrawingOverlay(InputArea* ic, BaseWindow* OverlayWindow);
+    InputArea* GetWidgetDrawingOverlay();
 
-    void SetTooltip(InputArea *TooltipArea, const char *TooltipText, int x, int y);
+    void SetTooltip(InputArea* TooltipArea, const char* TooltipText, int x, int y);
     /*!
         Return true if the mouse is still inside the area that initiated the tooltip;
 
@@ -234,13 +233,13 @@
       _event_root = Point(x, y);
     }
 
-    void SetBackgroundPaintLayer(AbstractPaintLayer *bkg);
+    void SetBackgroundPaintLayer(AbstractPaintLayer* bkg);
 
     /*!
         A special BaseWindow that is always on top of all other BaseWindow. It is even above the BaseWindow that is selected.
         \sa m_SelectedWindow, \sa GetSelectedWindow.
     */
-    void SetAlwaysOnFrontWindow(BaseWindow *window);
+    void SetAlwaysOnFrontWindow(BaseWindow* window);
 
 
     //! Enable the exclusive event input mode.
@@ -253,7 +252,7 @@
         \sa DisableExclusiveInputArea.
         @return True, if the exclusive input mode was enabled.
     */
-    bool EnableExclusiveInputArea(InputArea *input_area);
+    bool EnableExclusiveInputArea(InputArea* input_area);
     
     //! Disable the exclusive event input mode.
     /*!
@@ -261,7 +260,7 @@
         \sa EnableExclusiveInputArea.
         @return True, if the exclusive input mode was disabled.
     */
-    bool DisableExclusiveInputArea(InputArea *input_area);
+    bool DisableExclusiveInputArea(InputArea* input_area);
 
     //! Return true if the system is in exclusive input event mode.
     /*!
@@ -276,7 +275,7 @@
     void RestoreRenderingSurface();
 
     //! Get the backup texture data of this BaseWindow,
-    void* GetBackupTextureData(BaseWindow *base_window, int &width, int &height, int &format);
+    void* GetBackupTextureData(BaseWindow* base_window, int& width, int& height, int& format);
 
     //! Reset the DND focus area
     /*!
@@ -356,6 +355,23 @@
     //! Returns the area at the top of the keyboard grab stack.
     InputArea* GetKeyboardGrabArea();
 
+    // We use Rectangle texture to attach to the frame-buffer because some GPU like the Geforce FX 5600 do not
+    // have support for ARB_texture_non_power_of_two. However it does support ARB_texture_recatangle.
+    struct RenderTargetTextures
+    {
+      ObjectPtr<IOpenGLBaseTexture> color_rt;
+      ObjectPtr<IOpenGLBaseTexture> depth_rt;
+    };
+    
+    //! Return the RenderTargetTextures structure of a BaseWindow.
+    /*!
+        Return the color and depth texture of a BaseWindow.
+
+        @param window The BaseWindow.
+        @return A structure that contains the color and depth texture of a BaseWindow.
+    */
+    RenderTargetTextures& GetWindowBuffer(BaseWindow* window);
+
   private:
     //! Render the interface.
     void Draw(bool SizeConfigurationEvent, bool force_draw);
@@ -374,7 +390,7 @@
     void RenderTopViews(bool force_draw, std::list< ObjectWeakPtr<BaseWindow> >& WindowList, bool draw_modal);
 
     //! Render the content of a top view.
-    void RenderTopViewContent(BaseWindow *window, bool force_draw);
+    void RenderTopViewContent(BaseWindow* window, bool force_draw);
 
     void RenderMainWindowComposition(bool force_draw);
 
@@ -402,21 +418,21 @@
         @param strict If true and top_floating_view is already above bottom_floating_view, then bring top_floating_view lower
         so that it is strictly above bottom_floating_view.
     */
-    void PushHigher(BaseWindow *top_floating_view, BaseWindow *bottom_floating_view, bool strict = false);
+    void PushHigher(BaseWindow* top_floating_view, BaseWindow* bottom_floating_view, bool strict = false);
     //! Push a floating view at the top of the stack.
-    void PushToFront(BaseWindow *bottom_floating_view);
+    void PushToFront(BaseWindow* bottom_floating_view);
     //! Push a floating view at the bottom of the stack.
-    void PushToBack(BaseWindow *bottom_floating_view);
+    void PushToBack(BaseWindow* bottom_floating_view);
 
     /*!
         Returns the BaseWindow that is at the top of the BaseWindow stack, excluding the BaseWindow that is
         chosen to be always on to.
         \sa m_SelectedWindow. \sa SetAlwaysOnFrontWindow
     */
-    BaseWindow *GetSelectedWindow();
+    BaseWindow* GetSelectedWindow();
 
     
-    BaseWindow *GetFocusAreaWindow()
+    BaseWindow* GetFocusAreaWindow()
     {
       return m_FocusAreaWindow.GetPointer();
     }
@@ -433,12 +449,12 @@
 
     private:
 
-    void SetFocusAreaWindow(BaseWindow *window)
+    void SetFocusAreaWindow(BaseWindow* window)
     {
       m_FocusAreaWindow = window;
     }
 
-    void SetCurrentEvent(Event *event)
+    void SetCurrentEvent(Event* event)
     {
       m_CurrentEvent = event;
     }
@@ -461,19 +477,9 @@
     // UnRegister is called via the object destroyed event, hence the Object*.
     void UnRegisterWindow(Object*);
 
-    // We use Rectangle texture to attach to the frame-buffer because some GPU like the Geforce FX 5600 do not
-    // have support for ARB_texture_non_power_of_two. However it does support ARB_texture_recatangle.
-    struct RenderTargetTextures
-    {
-      ObjectPtr<IOpenGLBaseTexture> color_rt;
-      ObjectPtr<IOpenGLBaseTexture> depth_rt;
-    };
     ObjectPtr<IOpenGLBaseTexture> m_MainColorRT;
     ObjectPtr<IOpenGLBaseTexture> m_MainDepthRT;
 
-    //! Return the RenderTargetTextures structure of a ViewWindow.
-    RenderTargetTextures &GetWindowBuffer(BaseWindow* window);
-
     WeakBaseWindowPtr m_CurrentWindow;    //!< BaseWindow where event processing or rendering is happening.
     WeakBaseWindowPtr m_FocusAreaWindow;  //!< The BaseWindow that contains the _mouse_focus_area.
     WeakBaseWindowPtr m_MenuWindow;       //!< The BaseWindow that owns the menu being displayed;
@@ -498,7 +504,7 @@
     /*!
         @return The input area that has the exclusivity on all events.
     */
-    InputArea *GetExclusiveInputArea();
+    InputArea* GetExclusiveInputArea();
 
     /*!
         The exclusive input area gets all events without exception(greedy). The exclusive input area may decide to pass events 
@@ -542,14 +548,14 @@
     Point _event_root;
 
     bool on_menu_closure_continue_with_event_;
-    AbstractPaintLayer *m_Background;
+    AbstractPaintLayer* m_Background;
 
     typedef std::list<WeakBaseWindowPtr> WindowList;
     WindowList _view_window_list;
     WindowList _modal_view_window_list;
     WeakBaseWindowPtr _always_on_front_window;  //!< Floating view that always remains on top.
 
-    std::list<MenuPage* > *_menu_chain;
+    std::list<MenuPage* >* _menu_chain;
 
     /*!
         The BaseWindow where the last mouse down event happened.
@@ -558,7 +564,7 @@
     */
     WeakBaseWindowPtr m_SelectedWindow;
 
-    std::map<BaseWindow*, struct RenderTargetTextures > _window_to_texture_map;
+    std::map<BaseWindow*, struct RenderTargetTextures> _window_to_texture_map;
 
     WeakBaseWindowPtr m_ModalWindow;
     Point m_MouseLastPos;
@@ -574,7 +580,7 @@
     int m_Height;
 
     NString m_TooltipText;
-    InputArea *m_TooltipArea;
+    InputArea* m_TooltipArea;
     int m_TooltipX;
     int m_TooltipY;
 
@@ -599,7 +605,7 @@
     std::list<InputArea*> keyboard_grab_stack_;
 
   private:
-    WindowThread *window_thread_; //!< The WindowThread to which this object belongs.
+    WindowThread* window_thread_; //!< The WindowThread to which this object belongs.
 
     //! Perform some action before destruction.
     /*!
@@ -608,11 +614,11 @@
     */
     void BeforeDestructor();
 
-    WindowCompositor(const WindowCompositor &);
+    WindowCompositor(const WindowCompositor&);
     // Does not make sense for a singleton. This is a self assignment.
-    WindowCompositor &operator= (const WindowCompositor &);
+    WindowCompositor& operator= (const WindowCompositor&);
     // Declare operator address-of as private
-    WindowCompositor *operator &();
+    WindowCompositor* operator & ();
 
     friend class InputArea;
     friend class WindowThread;

=== modified file 'NuxGraphics/RenderingPipeGLSL.cpp'
--- NuxGraphics/RenderingPipeGLSL.cpp	2011-10-19 20:32:38 +0000
+++ NuxGraphics/RenderingPipeGLSL.cpp	2012-01-20 19:36:24 +0000
@@ -2165,10 +2165,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
 
     return _offscreen_color_rt0;
@@ -2214,10 +2216,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
 
     return _offscreen_color_rt1;
@@ -2263,10 +2267,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
 
     return _offscreen_color_rt1;
@@ -2313,10 +2319,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
 
     return _offscreen_color_rt1;
@@ -2383,10 +2391,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     return _offscreen_color_rt3;
   }
@@ -2447,10 +2457,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
 
     return _offscreen_color_rt0;
@@ -2512,10 +2524,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
   }
 
@@ -2552,10 +2566,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
 
     return _offscreen_color_rt0;
@@ -2594,10 +2610,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
   }
 
@@ -2754,10 +2772,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     return _offscreen_color_rt0;
   }
@@ -2809,10 +2829,12 @@
     {
       prevFBO->Activate(true);
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
     else
     {
       SetViewport(0, 0, previous_width, previous_height);
+      SetOrthographicProjectionMatrix(previous_width, previous_height);
     }
   }
 

=== modified file 'configure.ac'
--- configure.ac	2012-01-19 19:39:56 +0000
+++ configure.ac	2012-01-20 19:36:24 +0000
@@ -22,7 +22,7 @@
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205
 # So far there is no provision for more than one break in a day.
-m4_define([nux_abi_version], [20120119.01])
+m4_define([nux_abi_version], [20120120.01])
 
 m4_define([nux_version],
           [nux_major_version.nux_minor_version.nux_micro_version])