summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/FbTk/TextButton.cc4
-rw-r--r--src/IconButton.cc4
3 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ef5aa8d..9bae23b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.6: 2Changes for 0.9.6:
3*03/10/31: 3*03/10/31:
4 * Fix textbutton text alignment (out by one) (Simon)
5 TextButton.cc
4 * Tweak some positioning for winbutton drawn icons (Simon) 6 * Tweak some positioning for winbutton drawn icons (Simon)
5 WinButton.cc 7 WinButton.cc
6 * Fix iconbar button alignment and squash inactive tools (Simon) 8 * Fix iconbar button alignment and squash inactive tools (Simon)
diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc
index 4b2d45e..de8fad0 100644
--- a/src/FbTk/TextButton.cc
+++ b/src/FbTk/TextButton.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: TextButton.cc,v 1.3 2003/09/14 09:50:01 fluxgen Exp $ 22// $Id: TextButton.cc,v 1.4 2003/10/31 20:02:49 rathnor Exp $
23 23
24#include "TextButton.hh" 24#include "TextButton.hh"
25#include "Font.hh" 25#include "Font.hh"
@@ -138,7 +138,7 @@ void TextButton::drawText(int x_offset, int y_offset) {
138 textlen); // return new text len 138 textlen); // return new text len
139 139
140 // center text by default 140 // center text by default
141 int center_pos = height()/2 + font().ascent()/2; 141 int center_pos = height()/2 + font().ascent()/2 - 1;
142 142
143 font().drawText(backgroundPixmap() == ParentRelative ? window() : m_buffer.drawable(), 143 font().drawText(backgroundPixmap() == ParentRelative ? window() : m_buffer.drawable(),
144 screenNumber(), 144 screenNumber(),
diff --git a/src/IconButton.cc b/src/IconButton.cc
index 093298e..bc0c9d5 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: IconButton.cc,v 1.10 2003/10/31 19:32:39 rathnor Exp $ 23// $Id: IconButton.cc,v 1.11 2003/10/31 20:02:49 rathnor Exp $
24 24
25#include "IconButton.hh" 25#include "IconButton.hh"
26 26
@@ -197,7 +197,7 @@ void IconButton::setupWindow() {
197 197
198void IconButton::drawText(int x, int y) { 198void IconButton::drawText(int x, int y) {
199 // offset text 199 // offset text
200 FbTk::TextButton::drawText(m_icon_window.x() + m_icon_window.width() + 1, y); 200 FbTk::TextButton::drawText(m_icon_window.x() + m_icon_window.width() + 1, y);
201} 201}
202 202
203 203