fixed menutitle and menulables drawn to close to screen-bottom, patch from Mathias Gumz
fluxgen fluxgen
2 files changed,
4 insertions(+),
4 deletions(-)
M
src/FbTk/Menu.cc
→
src/FbTk/Menu.cc
@@ -22,7 +22,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: Menu.cc,v 1.69 2004/06/27 13:50:24 fluxgen Exp $ +// $Id: Menu.cc,v 1.70 2004/07/05 09:40:08 fluxgen Exp $ //use GNU extensions #ifndef _GNU_SOURCE@@ -768,7 +768,7 @@ font.drawText(m_real_title_pm.drawable(), // drawable
screenNumber(), theme().titleTextGC().gc(), // graphic context text, len, // text string with lenght - dx, theme().titleHeight()/2 + (font.ascent() + theme().bevelWidth())/2); // position + dx, theme().titleHeight()/2 + (font.ascent() - theme().bevelWidth())/2); // position }
M
src/FbTk/MenuItem.cc
→
src/FbTk/MenuItem.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: MenuItem.cc,v 1.3 2004/06/10 11:40:43 fluxgen Exp $ +// $Id: MenuItem.cc,v 1.4 2004/07/05 09:40:08 fluxgen Exp $ #include "MenuItem.hh" #include "Command.hh"@@ -90,7 +90,7 @@ int text_y = y, text_x = x;
int text_w = theme.frameFont().textWidth(label().c_str(), label().size()); - text_y = y + theme.bevelWidth()/2 + theme.frameFont().ascent()/2 + height/2; + text_y = y - theme.bevelWidth()/2 + theme.frameFont().ascent()/2 + height/2; switch(theme.frameFontJustify()) { case FbTk::LEFT: