real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Some inconsequential style adjustments.

Browse Source 
This was SVN commit r14809.
This commit is contained in:
JoshuaJB 2014-03-06 02:24:06 +00:00
parent ef76d24e66
commit 8f30e722ab
2 changed files with 64 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
binaries/data/mods/public/gui/session/session.xml
View File

@ -35,14 +35,6 @@
<!-- HOTKEYS (For some reason, they won't work properly unless outside menu) --> <!-- HOTKEYS (For some reason, they won't work properly unless outside menu) -->
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<!-- Exit button Hotkey -->
<!--
<action on="Press"><![CDATA[
messageBox(400, 200, "Do you really want to quit?", "Confirmation", 0,
["Yes", "No!"], [leaveGame, null]);
]]></action>
-->
<object hotkey="leave"> <object hotkey="leave">
<action on="Press">closeOpenDialogs();</action> <action on="Press">closeOpenDialogs();</action>
</object> </object>
@ -232,6 +224,7 @@
<object hotkey="selection.cancel"> <object hotkey="selection.cancel">
<action on="Press">clearSelection()</action> <action on="Press">clearSelection()</action>
</object> </object>
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
<!-- Developer / Debug items --> <!-- Developer / Debug items -->
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
@ -1330,11 +1323,8 @@
</repeat> </repeat>
</object> </object>
</object> </object>
</object> <!-- END OF UNIT COMMANDS --> </object> <!-- END OF UNIT COMMANDS -->
</object><!-- END OF BOTTOM PANEL --> </object><!-- END OF BOTTOM PANEL -->
</object> <!-- END OF SN OBJECT --> </object> <!-- END OF SN OBJECT -->
<!-- ================================ ================================ --> <!-- ================================ ================================ -->
@ -1355,7 +1345,6 @@
<object size="0 0 100% 100%" type="text" style="CenteredButtonText" name="disconnectedExitButtonText" ghost="true">Exit</object> <object size="0 0 100% 100%" type="text" style="CenteredButtonText" name="disconnectedExitButtonText" ghost="true">Exit</object>
<action on="Press">leaveGame()</action> <action on="Press">leaveGame()</action>
</object> </object>
</object> </object>
</objects> </objects>

6
source/gui/MiniMap.cpp
View File

@ -151,18 +151,14 @@ void CMiniMap::HandleMessage(SGUIMessage &Message)
case GUIM_MOUSE_RELEASE_LEFT: case GUIM_MOUSE_RELEASE_LEFT:
{ {
if(m_MouseHovering && m_Clicking) if(m_MouseHovering && m_Clicking)
{
SetCameraPos(); SetCameraPos();
}
m_Clicking = false; m_Clicking = false;
break; break;
} }
case GUIM_MOUSE_DBLCLICK_LEFT: case GUIM_MOUSE_DBLCLICK_LEFT:
{ {
if(m_MouseHovering && m_Clicking) if(m_MouseHovering && m_Clicking)
{
SetCameraPos(); SetCameraPos();
}
m_Clicking = false; m_Clicking = false;
break; break;
} }
@ -190,9 +186,7 @@ void CMiniMap::HandleMessage(SGUIMessage &Message)
case GUIM_MOUSE_MOTION: case GUIM_MOUSE_MOTION:
{ {
if (m_MouseHovering && m_Clicking) if (m_MouseHovering && m_Clicking)
{
SetCameraPos(); SetCameraPos();
}
break; break;
} }
case GUIM_MOUSE_WHEEL_DOWN: case GUIM_MOUSE_WHEEL_DOWN: