From 31a82304d62ab4943c0926c35cce552e2164eaf4 Mon Sep 17 00:00:00 2001 From: drw Date: Tue, 06 Apr 2004 15:52:02 +0000 Subject: Do not override menu font size, use font as defined in Appearance settings, and fixed compiler warning --- (limited to 'core/apps') diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp index cc88555..93348f4 100644 --- a/core/apps/embeddedkonsole/TEWidget.cpp +++ b/core/apps/embeddedkonsole/TEWidget.cpp @@ -809,7 +809,7 @@ void TEWidget::mouseReleaseEvent(QMouseEvent* ev) //printf("release [%d,%d] %d\n",ev->x()/font_w,ev->y()/font_h,ev->button()); if ( ev->button() == LeftButton) { - if (QABS(ev->x() - mouse_down_x) < 3 + if (QABS(ev->x() - mouse_down_x) < 3 && QABS(ev->y() - mouse_down_y) < 3 && ev->y() < qApp->desktop()->height()/8) { emit setFullScreen(false); @@ -1389,7 +1389,7 @@ void TEWidget::dropEvent(QDropEvent* event) #endif -void TEWidget::drop_menu_activated(int item) +void TEWidget::drop_menu_activated(int /*item*/) { #ifndef QT_NO_DRAGANDDROP switch (item) diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp index c5df47f..cbea7bd 100644 --- a/core/apps/embeddedkonsole/konsole.cpp +++ b/core/apps/embeddedkonsole/konsole.cpp @@ -510,15 +510,6 @@ void Konsole::init(const char* _pgm, QStrList & _args) QMenuBar *menuBar = new QMenuBar( menuToolBar ); - bool c7xx = false; - if (qApp->desktop()->width() > 600 || qApp->desktop()->height() > 600) - { - c7xx = true; - } - QFont menuFont; - menuFont.setPointSize(c7xx? 18 : 10); - qApp->setFont(menuFont, true); - setFont(cfont); configMenu = new QPopupMenu( this); -- cgit v0.9.0.2