From 4126253ad5ab8303624bdaaa56075f110e3293ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Sun, 27 Oct 2019 12:39:30 +0200 Subject: [PATCH] Fixed|UI: Fixed "Show Taskbar" menu item; minor tweaks --- doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp | 5 ----- doomsday/libs/gamekit/libs/common/src/hu_menu.cpp | 1 + doomsday/libs/gui/src/windoweventhandler.cpp | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp b/doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp index 34b85fea5b..9e53c79c43 100644 --- a/doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp +++ b/doomsday/apps/client/src/ui/home/gamecolumnwidget.cpp @@ -500,11 +500,6 @@ DE_GUI_PIMPL(GameColumnWidget) } }); } - else - { - popup->items() << new ui::ActionItem("Select Mods...", - [button]() { button->selectPackages(); }); - } // Items suitable for all types of profiles. popup->items() diff --git a/doomsday/libs/gamekit/libs/common/src/hu_menu.cpp b/doomsday/libs/gamekit/libs/common/src/hu_menu.cpp index 896d959e2c..82fdb3794c 100644 --- a/doomsday/libs/gamekit/libs/common/src/hu_menu.cpp +++ b/doomsday/libs/gamekit/libs/common/src/hu_menu.cpp @@ -928,6 +928,7 @@ void Hu_MenuInitOptionsPage() .setShortcut('t') .setFont(MENU_FONT1) .setGroup(1) + .setUserValue2(NumberValue(0)) .setAction(Widget::Deactivated, Hu_MenuSelectControlPanelLink) .setAction(Widget::FocusGained, Hu_MenuDefaultFocusAction); diff --git a/doomsday/libs/gui/src/windoweventhandler.cpp b/doomsday/libs/gui/src/windoweventhandler.cpp index c1721197de..57ec0302b2 100644 --- a/doomsday/libs/gui/src/windoweventhandler.cpp +++ b/doomsday/libs/gui/src/windoweventhandler.cpp @@ -49,7 +49,7 @@ struct Flywheel }; float pos = 0; - float friction = 1; + float friction = 2.0f; float momentum = 0; bool isReleased = true; List samples;