Merge lp:~unity-team/nux/nux.expose-statictext-texture into lp:nux/2.0

[Jay Taoko]

* Expose the StaticText device texture
* Code style fixes

[lp:~unity-team/nux/nux.expose-statictext-texture]

557. By Gord Allott on 2012-02-07

Adds very basic completion support to nux,
Essentially just adds text to the end of the TextEntry widget without any real logic as the logic we want for unity is
different from what we want for a toolkit

Basically just a visual change to allow hud to offer completion. Fixes: . Approved by Tim Penhey.

558. By Thomi Richards on 2012-02-08

Moved keycode definitions from unity into nux, where they belong.. Fixes: . Approved by Jay Taoko.

[Jason Smith (jassmith)]

Looks good

review: Approve

[lp:~unity-team/nux/nux.expose-statictext-texture]

559. By Jason Smith on 2012-02-09

Improves dash startup times dramatically.. Fixes: . Approved by Thomi Richards.

560. By Jason Smith on 2012-02-09

Makes nux lazy load some of its less frequently use, yet more expensive objects. Fixes: . Approved by Jay Taoko, Thomi Richards.

561. By Jay Taoko on 2012-02-09

* Merged with Nux trunk

=== modified file 'Nux/StaticText.cpp'
--- Nux/StaticText.cpp	2012-02-02 17:05:21 +0000
+++ Nux/StaticText.cpp	2012-02-09 20:51:18 +0000
@@ -1,3 +1,24 @@
+/*
+ * Copyright 2012 Inalogic® Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License, as
+ * published by the  Free Software Foundation; either version 2.1 or 3.0
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Jay Taoko <[e-mail]>
+ *
+ */
+
 #include "Nux.h"
 #include "Layout.h"
 #include "HLayout.h"
@@ -29,13 +50,13 @@
 
   NUX_IMPLEMENT_OBJECT_TYPE(StaticText);
 
-  StaticText::StaticText(const std::string &text, NUX_FILE_LINE_DECL)
-    : View(NUX_FILE_LINE_PARAM)
+  StaticText::StaticText(const std::string& text, NUX_FILE_LINE_DECL)
+  : View(NUX_FILE_LINE_PARAM)
+  , text_width_(0)
+  , text_height_(0)
   {
     padding_x_ = 0;
     padding_y_ = 0;
-    text_width_ = 0;
-    text_height_ = 0;
     update_text_rendering_ = true;
     text_alignment_ = ALIGN_CENTER;
 
@@ -64,7 +85,7 @@
     dpy_ = 96.0f;
 #endif
 
-    _size_match_text = true;
+    size_match_text_ = true;
     text_color_ = color::White;
     clip_to_width_ = 0;
 
@@ -164,12 +185,12 @@
 
   void StaticText::SetSizeMatchText(bool size_match_text)
   {
-    _size_match_text = size_match_text;
+    size_match_text_ = size_match_text;
   }
 
   bool StaticText::GetSizeMatchText() const
   {
-    return _size_match_text;
+    return size_match_text_;
   }
 
    void StaticText::SetClipping(int clipping)
@@ -291,7 +312,7 @@
     return GetFontSize();
   }
 
-  void StaticText::SetText(const std::string &text)
+  void StaticText::SetText(const std::string& text)
   {
     if (text_ == text)
       return;
@@ -317,7 +338,7 @@
     return text_;
   }
 
-  void StaticText::SetTextColor(const Color &text_color)
+  void StaticText::SetTextColor(const Color& text_color)
   {
     text_color_ = text_color;
   }
@@ -327,7 +348,7 @@
     return text_color_;
   }
 
-  void StaticText::SetFontName(const std::string &font_name)
+  void StaticText::SetFontName(const std::string& font_name)
   {
     if (font_name_ == font_name)
       return;
@@ -356,7 +377,7 @@
     return font_name_;
   }
 
-  void StaticText::GetTextLayoutSize(int &width, int &height) const
+  void StaticText::GetTextLayoutSize(int& width, int& height) const
   {
     if (text_ == "")
     {
@@ -386,6 +407,17 @@
     return text_alignment_;
   }
   
+  ObjectPtr<nux::IOpenGLBaseTexture> StaticText::GetTextTexture()
+  {
+    if (update_text_rendering_)
+    {
+      // If the text rendering needs to be updated, do it here.
+      UpdateTextRendering();
+    }
+
+    return dw_texture_;
+  }
+
   Size StaticText::GetTextSizeNoClip()
   {
     if (no_clip_size_.width == 0)
@@ -397,10 +429,10 @@
   Size StaticText::ComputeTextSize(bool assign, bool with_clipping)
   {
     HRESULT hr;
-    IDWriteFactory *pDWriteFactory = GetGraphicsDisplay()->GetDirectWriteFactory();
+    IDWriteFactory* pDWriteFactory = GetGraphicsDisplay()->GetDirectWriteFactory();
 
-    ID2D1RenderTarget *pRT = NULL;
-    IDWriteTextFormat *pTextFormat = NULL;
+    ID2D1RenderTarget* pRT = NULL;
+    IDWriteTextFormat* pTextFormat = NULL;
 
     hr = pDWriteFactory->CreateTextFormat(
         ANSICHAR_TO_UNICHAR(font_name_.c_str()),                  // Font family name.
@@ -489,12 +521,12 @@
 
     HRESULT hr;
 
-    ID2D1Factory *pD2DFactory = GetGraphicsDisplay()->GetDirect2DFactory();
-    IDWriteFactory *pDWriteFactory = GetGraphicsDisplay()->GetDirectWriteFactory();
-    IWICImagingFactory *pWICFactory = GetGraphicsDisplay()->GetWICFactory();
+    ID2D1Factory* pD2DFactory = GetGraphicsDisplay()->GetDirect2DFactory();
+    IDWriteFactory* pDWriteFactory = GetGraphicsDisplay()->GetDirectWriteFactory();
+    IWICImagingFactory* pWICFactory = GetGraphicsDisplay()->GetWICFactory();
 
-    ID2D1RenderTarget *pRT = NULL;
-    IDWriteTextFormat *pTextFormat = NULL;
+    ID2D1RenderTarget* pRT = NULL;
+    IDWriteTextFormat* pTextFormat = NULL;
 
     hr = pDWriteFactory->CreateTextFormat(
       ANSICHAR_TO_UNICHAR(font_name_.c_str()),                  // Font family name.
@@ -534,7 +566,7 @@
       &pTextLayout_                         // The IDWriteTextLayout interface pointer.
       );
 
-    IDWriteInlineObject *inlineObject = nullptr;
+    IDWriteInlineObject* inlineObject = nullptr;
     if (SUCCEEDED(hr))
     {
       pDWriteFactory->CreateEllipsisTrimmingSign(
@@ -544,7 +576,7 @@
     DWRITE_TRIMMING trimming = {DWRITE_TRIMMING_GRANULARITY_CHARACTER, 0, 0};
     hr = pTextLayout_->SetTrimming(&trimming, inlineObject);
 
-    IWICBitmap *pWICBitmap = NULL;
+    IWICBitmap* pWICBitmap = NULL;
     if (SUCCEEDED(hr))
     {
       hr = pWICFactory->CreateBitmap(
@@ -574,11 +606,11 @@
         &pRT);
     }
 
-    ID2D1SolidColorBrush *pBrush;
+    ID2D1SolidColorBrush* pBrush;
     hr = pRT->CreateSolidColorBrush(D2D1::ColorF(D2D1::ColorF(color.red, color.green, color.blue, color.alpha)), &pBrush);
 
     // Create the text renderer
-    CustomTextRenderer *pTextRenderer_ = new (std::nothrow) CustomTextRenderer(
+    CustomTextRenderer* pTextRenderer_ = new (std::nothrow) CustomTextRenderer(
       pD2DFactory,
       pRT,
       pBrush,
@@ -779,11 +811,11 @@
 
   void StaticText::RasterizeText(void* cairo_context, Color color)
   {
-    cairo_t *cairo_ctx = (cairo_t*) cairo_context;
+    cairo_t* cairo_ctx = (cairo_t*) cairo_context;
 
-    PangoLayout           *pango_layout  = NULL;
-    PangoFontDescription  *font_desc     = NULL;
-    PangoContext          *pango_ctx     = NULL;
+    PangoLayout*          pango_layout  = NULL;
+    PangoFontDescription* font_desc     = NULL;
+    PangoContext*         pango_ctx     = NULL;
     int                   dpi            = 96;
 
     // Create layout.
@@ -848,7 +880,7 @@
     }
 
     cairo_graphics_ = new CairoGraphics(CAIRO_FORMAT_ARGB32, sz.width, sz.height);
-    cairo_t *cairo_ctx = cairo_graphics_->GetContext();
+    cairo_t* cairo_ctx = cairo_graphics_->GetContext();
     cairo_set_operator(cairo_ctx, CAIRO_OPERATOR_CLEAR);
     cairo_paint(cairo_ctx);
     cairo_set_operator(cairo_ctx, CAIRO_OPERATOR_OVER);
@@ -860,7 +892,7 @@
     // NTexture2D is the high level representation of an image that is backed by
     // an actual opengl texture.
 
-    BaseTexture *rasterized_text_texture = NULL;
+    BaseTexture* rasterized_text_texture = NULL;
 
     rasterized_text_texture = GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableTexture();
     rasterized_text_texture->Update(bitmap);

=== modified file 'Nux/StaticText.h'
--- Nux/StaticText.h	2012-02-02 17:13:45 +0000
+++ Nux/StaticText.h	2012-02-09 20:51:18 +0000
@@ -1,19 +1,44 @@
+/*
+ * Copyright 2012 Inalogic® Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License, as
+ * published by the  Free Software Foundation; either version 2.1 or 3.0
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Jay Taoko <[e-mail]>
+ *
+ */
+
 #ifndef STATICTEXT_H
 #define STATICTEXT_H
 
 #include "NuxCore/Size.h"
 
-   #if defined(NUX_OS_WINDOWS)
-     #define NUX_STATIC_TEXT_USE_DIRECT_WRITE
-   #elif defined(NUX_OS_LINUX)
-     #define NUX_STATIC_TEXT_USE_CAIRO
-   #else
-     #error Not implemented.
-   #endif
+#if defined(NUX_OS_WINDOWS)
+  #define NUX_STATIC_TEXT_USE_DIRECT_WRITE
+#elif defined(NUX_OS_LINUX)
+  #define NUX_STATIC_TEXT_USE_CAIRO
+#else
+  #error Not implemented.
+#endif
 
 namespace nux
 {
   class CairoGraphics;
+
+  /*!
+      A View that renders as static text.
+  */
   class StaticText: public View
   {
     NUX_DECLARE_OBJECT_TYPE(StaticText, View);
@@ -35,7 +60,7 @@
       ALIGN_RIGHT,
     };
 
-    StaticText(const std::string &text, NUX_FILE_LINE_PROTO);
+    StaticText(const std::string& text, NUX_FILE_LINE_PROTO);
     virtual ~StaticText();
 
     //! Set size of widget according to the text extent.
@@ -48,7 +73,7 @@
     bool GetSizeMatchText() const;
 
     //! Set the text string.
-    void SetText(const std::string &text);
+    void SetText(const std::string& text);
 
     //! Get the text string.
     std::string GetText() const;
@@ -59,7 +84,7 @@
 
         @param text_color The text color.
     */
-    void SetTextColor(const Color &text_color);
+    void SetTextColor(const Color& text_color);
     
     //! Get text color.
     /*!
@@ -75,7 +100,7 @@
 
         @param font_name The font name.
     */
-    void SetFontName(const std::string &font_name);
+    void SetFontName(const std::string& font_name);
 
     //! Get the font name.
     /*!
@@ -100,7 +125,7 @@
     int GetFontSize() const;
     int GetTextPointSize() const; //deprecated: use GetFontSize
 
-    void GetTextLayoutSize(int &width, int &height) const;
+    void GetTextLayoutSize(int& width, int& height) const;
 
     Size GetTextLayoutSize() const;
 
@@ -116,6 +141,15 @@
     */
     TextAlignment GetTextAlignment() const;
 
+    //! Returns the device texture for the text.
+    /*!
+        Returns the device texture for the text. The device texture may be used \n
+        for direct rendering.
+
+        @return A smart point for the device texture.
+    */
+    ObjectPtr<nux::IOpenGLBaseTexture> GetTextTexture();
+
     sigc::signal<void, StaticText*> text_changed;
 
   protected:
@@ -129,12 +163,9 @@
     std::string text_;
     Color text_color_;
 
-    BaseTexture *rasterized_text_texture_;
-
-    int _pre_layout_width;
-    int _pre_layout_height;
-
-    bool _size_match_text;
+    BaseTexture* rasterized_text_texture_;
+
+    bool size_match_text_;
 
     int clip_to_width_; //!< Wrapping of line.
 
@@ -167,7 +198,7 @@
     void RasterizeText(void* cairo_context, Color color);
     void UpdateTextRendering();
 
-    CairoGraphics *cairo_graphics_;
+    CairoGraphics* cairo_graphics_;
 #endif
 
   private:
@@ -190,9 +221,10 @@
         @return The full text size.
     */
     Size GetTextSizeNoClip();
-    float padding_x_; //!< Adds a padding around the entire text box.
-    float padding_y_; //!< Adds a padding around the entire text box.
-    Size no_clip_size_; //! Cacne of the GetTextSizeNoClip results so we don't recompute them constantly.
+
+    float padding_x_;   //!< Adds a padding around the entire text box.
+    float padding_y_;   //!< Adds a padding around the entire text box.
+    Size no_clip_size_; //! Cache of the GetTextSizeNoClip results so we don't recompute them constantly.
   };
 
 }

=== modified file 'configure.ac'
--- configure.ac	2012-02-04 00:19:46 +0000
+++ configure.ac	2012-02-09 20:51:18 +0000
@@ -22,7 +22,7 @@
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205
 # To make more than one API change in a day, add a number to the date. Like 20111205.xx
-m4_define([nux_abi_version], [20120203.02])
+m4_define([nux_abi_version], [20120209.01])
 
 m4_define([nux_version],
           [nux_major_version.nux_minor_version.nux_micro_version])