Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Don't allow changeing disabled dropdowns using the scrollwheel. Also corrects some things in b9a4af4cc6.

Browse Source 
This was SVN commit r15406.
This commit is contained in:
JoshuaJB 2014-06-21 00:25:12 +00:00
parent b9a4af4cc6
commit c793da5368
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View File

@ -1058,7 +1058,7 @@ function onGameAttributesChange()
var startingResourcesText = Engine.GetGUIObjectByName("startingResourcesText");
var gameSpeedText = Engine.GetGUIObjectByName("gameSpeedText");
// Josh 20.6.2014: Not quite sure why we check for undefined on these properties, that shouldn't ever happen (?)
// We have to check for undefined on these properties as not all maps define them.
var sizeIdx = (mapSettings.Size !== undefined && g_MapSizes.tiles.indexOf(mapSettings.Size) != -1 ? g_MapSizes.tiles.indexOf(mapSettings.Size) : g_MapSizes["default"]);
var speedIdx = (g_GameAttributes.gameSpeed !== undefined && g_GameSpeeds.speeds.indexOf(g_GameAttributes.gameSpeed) != -1) ? g_GameSpeeds.speeds.indexOf(g_GameAttributes.gameSpeed) : g_GameSpeeds["default"];
var victoryIdx = (mapSettings.GameType !== undefined && VICTORY_DATA.indexOf(mapSettings.GameType) != -1 ? VICTORY_DATA.indexOf(mapSettings.GameType) : VICTORY_DEFAULTIDX);

2
binaries/data/mods/public/gui/lobby/lobby.js
View File

@ -419,7 +419,7 @@ function joinSelectedGame()
}
// Open Multiplayer connection window with join option.
Engine.PushGuiPage("page_gamesetup_mp.xml", { multiplayerGameType: "join", name: sname, ip: "127.0.0.1", rating: g_userRating });
Engine.PushGuiPage("page_gamesetup_mp.xml", { multiplayerGameType: "join", name: sname, ip: sip, rating: g_userRating });
}
}

10
source/gui/CDropDown.cpp
View File

@ -231,8 +231,11 @@ void CDropDown::HandleMessage(SGUIMessage &Message)
case GUIM_MOUSE_WHEEL_DOWN:
{
bool enabled;
GUI<bool>::GetSetting(this, "enabled", enabled);
// Don't switch elements by scrolling when open, causes a confusing interaction between this and the scrollbar.
if (m_Open)
if (m_Open || !enabled)
break;
GUI<int>::GetSetting(this, "selected", m_ElementHighlight);
@ -246,8 +249,11 @@ void CDropDown::HandleMessage(SGUIMessage &Message)
case GUIM_MOUSE_WHEEL_UP:
{
bool enabled;
GUI<bool>::GetSetting(this, "enabled", enabled);
// Don't switch elements by scrolling when open, causes a confusing interaction between this and the scrollbar.
if (m_Open)
if (m_Open || !enabled)
break;
GUI<int>::GetSetting(this, "selected", m_ElementHighlight);