nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

some qt_main.cpp formatting cleanup

Browse Source
This commit is contained in:
PatR
2020-08-05 11:10:57 -07:00
parent b8b4fc70da
commit be3edcd097
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
win/Qt/qt_main.cpp
View File

@@ -827,7 +827,8 @@ public:
const QMimeSource* data(const QString& abs_name) const
{
const QMimeSource* r = 0;
if ( (NetHackMimeSourceFactory*)this == Q3MimeSourceFactory::defaultFactory() )
if ( (NetHackMimeSourceFactory *) this
== Q3MimeSourceFactory::defaultFactory() )
r = Q3MimeSourceFactory::data(abs_name);
else
r = Q3MimeSourceFactory::defaultFactory()->data(abs_name);
@@ -1006,51 +1007,59 @@ void NetHackQtMainWindow::keyPressEvent(QKeyEvent* event)
const char* d = g.Cmd.dirchars;
switch (event->key()) {
case Qt::Key_Up:
case Qt::Key_Up:
if ( dirkey == d[0] )
dirkey = d[1];
else if ( dirkey == d[4] )
dirkey = d[3];
else
dirkey = d[2];
break; case Qt::Key_Down:
break;
case Qt::Key_Down:
if ( dirkey == d[0] )
dirkey = d[7];
else if ( dirkey == d[4] )
dirkey = d[5];
else
dirkey = d[6];
break; case Qt::Key_Left:
break;
case Qt::Key_Left:
if ( dirkey == d[2] )
dirkey = d[1];
else if ( dirkey == d[6] )
dirkey = d[7];
else
dirkey = d[0];
break; case Qt::Key_Right:
break;
case Qt::Key_Right:
if ( dirkey == d[2] )
dirkey = d[3];
else if ( dirkey == d[6] )
dirkey = d[5];
else
dirkey = d[4];
break; case Qt::Key_PageUp:
break;
case Qt::Key_PageUp:
dirkey = 0;
if (message) message->Scroll(0,-1);
break; case Qt::Key_PageDown:
break;
case Qt::Key_PageDown:
dirkey = 0;
if (message) message->Scroll(0,+1);
break; case Qt::Key_Space:
break;
case Qt::Key_Space:
if ( flags.rest_on_space ) {
event->ignore();
return;
}
case Qt::Key_Enter:
case Qt::Key_Enter:
if ( map )
map->clickCursor();
break; default:
break;
default:
dirkey = 0;
event->ignore();
break;
}
}
@@ -1080,8 +1089,10 @@ void NetHackQtMainWindow::closeEvent(QCloseEvent* e)
void NetHackQtMainWindow::ShowIfReady()
{
if (message && map && status) {
QWidget* hp = qt_compact_mode ? static_cast<QWidget *>(stack) : static_cast<QWidget *>(hsplitter);
QWidget* vp = qt_compact_mode ? static_cast<QWidget *>(stack) : static_cast<QWidget *>(vsplitter);
QWidget* hp = qt_compact_mode ? static_cast<QWidget *>(stack)
: static_cast<QWidget *>(hsplitter);
QWidget* vp = qt_compact_mode ? static_cast<QWidget *>(stack)
: static_cast<QWidget *>(vsplitter);
message->Widget()->setParent(hp);
map->Widget()->setParent(vp);
status->Widget()->setParent(hp);