Client|Widgets: Cleanup

skyjake · May 28, 2013 · 62b4476 · 62b4476
1 parent 3105b80
commit 62b4476
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/doomsday/client/src/ui/widgets/lineeditwidget.cpp b/doomsday/client/src/ui/widgets/lineeditwidget.cpp
@@ -52,7 +52,6 @@ DENG2_OBSERVES(Atlas, Reposition)
     Drawable drawable;
     GLUniform uMvpMatrix;
     GLUniform uColor;
-    GLUniform uTex;
 
     Instance(Public *i)
         : Base(i),
@@ -61,8 +60,7 @@ DENG2_OBSERVES(Atlas, Reposition)
           margin(0),
           needGeometry(false),
           uMvpMatrix("uMvpMatrix", GLUniform::Mat4),
-          uColor    ("uColor",     GLUniform::Vec4),
-          uTex      ("uTex",       GLUniform::Sampler2D)
+          uColor    ("uColor",     GLUniform::Vec4)
     {
         height = new ScalarRule(0);
 
@@ -116,9 +114,6 @@ DENG2_OBSERVES(Atlas, Reposition)
         composer.setAtlas(atlas());
         composer.setText(self.text());
 
-        // We'll be using the shared atlas.
-        uTex = atlas();
-
         // Temporary background texture for development...
         bgTex = atlas().alloc(Image::solidColor(Image::Color(255, 255, 255, 255), Image::Size(1, 1)));
 
@@ -127,8 +122,7 @@ DENG2_OBSERVES(Atlas, Reposition)
 
         self.root().shaders().build(drawable.program(), "generic.textured.color")
                 << uMvpMatrix
-                //<< uColor
-                << uTex;
+                << self.root().uAtlas();
 
         self.root().shaders().build(drawable.program("cursor"), "generic.color_ucolor")
                 << uMvpMatrix
@@ -165,9 +159,7 @@ DENG2_OBSERVES(Atlas, Reposition)
 
         // Text lines.
         Rectanglei const contentRect = pos.shrunk(margin);
-        composer.makeVertices(verts, contentRect,
-                              GLTextComposer::AlignLeft,
-                              GLTextComposer::AlignLeft);
+        composer.makeVertices(verts, contentRect, AlignLeft, AlignLeft);
 
         // Underline the possible suggested completion.
         if(self.isSuggestingCompletion())

diff --git a/doomsday/client/src/ui/widgets/logwidget.cpp b/doomsday/client/src/ui/widgets/logwidget.cpp
@@ -113,7 +113,7 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
         {
             DENG2_GUARD(this);
             composer.update();
-            composer.makeVertices(verts, Vector2i(0, y), GLTextComposer::AlignLeft);
+            composer.makeVertices(verts, Vector2i(0, y), AlignLeft);
         }
 
         void clear()
@@ -329,7 +329,6 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
     GLUniform uShadowColor;
     GLUniform uColor;
     GLUniform uBgMvpMatrix;
-    GLUniform uBgTex;
     Matrix4f projMatrix;
     Matrix4f viewMatrix;
     Id bgTex;
@@ -353,8 +352,7 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
           uTex        ("uTex",       GLUniform::Sampler2D),
           uShadowColor("uColor",     GLUniform::Vec4),
           uColor      ("uColor",     GLUniform::Vec4),
-          uBgMvpMatrix("uMvpMatrix", GLUniform::Mat4),
-          uBgTex      ("uTex",       GLUniform::Sampler2D)
+          uBgMvpMatrix("uMvpMatrix", GLUniform::Mat4)
     {
         updateStyle();
     }
@@ -493,7 +491,6 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
         Image solidWhitePixel = Image::solidColor(Image::Color(255, 255, 255, 255),
                                                   Image::Size(1, 1));
         bgTex = self.root().atlas().alloc(solidWhitePixel);
-        uBgTex = self.root().atlas();
 
         scrollTex = entryAtlas->alloc(solidWhitePixel);
 
@@ -503,7 +500,7 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
         background.addBuffer(bgBuf = new VertexBuf);
         self.root().shaders().build(background.program(), "generic.textured.color")
                 << uBgMvpMatrix
-                << uBgTex;
+                << self.root().uAtlas();
 
         // Vertex buffer for the log entries.
         contents.addBuffer(buf = new VertexBuf);
@@ -752,8 +749,8 @@ DENG2_PIMPL(LogWidget), public Font::RichFormat::IStyle
             // Update the background quad.
             bgBuf->setVertices(gl::TriangleStrip,
                                VertexBuf::Builder().makeQuad(pos,
-                                                             self.style().colors().colorf("background"),
-                                                             self.root().atlas().imageRectf(bgTex).middle()),
+                                   self.style().colors().colorf("background"),
+                                   self.root().atlas().imageRectf(bgTex).middle()),
                                gl::Static);
         }