M ChangeLog → ChangeLog

@@ -1,6 +1,8 @@ 
 (Format: Year/Month/Day)
 Changes for 0.9.6:
 *03/10/31:
+  * Fix textbutton text alignment (out by one) (Simon)
+    TextButton.cc
   * Tweak some positioning for winbutton drawn icons (Simon)
     WinButton.cc
   * Fix iconbar button alignment and squash inactive tools (Simon)

M src/FbTk/TextButton.cc → src/FbTk/TextButton.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: TextButton.cc,v 1.3 2003/09/14 09:50:01 fluxgen Exp $
+// $Id: TextButton.cc,v 1.4 2003/10/31 20:02:49 rathnor Exp $
 
 #include "TextButton.hh"
 #include "Font.hh"
@@ -138,7 +138,7 @@ text().c_str(), text().size(),
                                     textlen); // return new text len
 
     // center text by default
-    int center_pos = height()/2 + font().ascent()/2;
+    int center_pos = height()/2 + font().ascent()/2 - 1;
 
     font().drawText(backgroundPixmap() == ParentRelative ? window() : m_buffer.drawable(),
                     screenNumber(),

M src/IconButton.cc → src/IconButton.cc

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: IconButton.cc,v 1.10 2003/10/31 19:32:39 rathnor Exp $
+// $Id: IconButton.cc,v 1.11 2003/10/31 20:02:49 rathnor Exp $
 
 #include "IconButton.hh"
 
@@ -197,7 +197,7 @@ }
 
 void IconButton::drawText(int x, int y) {
     // offset text
-    FbTk::TextButton::drawText(m_icon_window.x() + m_icon_window.width() + 1, y);                               
+    FbTk::TextButton::drawText(m_icon_window.x() + m_icon_window.width() + 1, y);
 }