mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow right-click on disabled buttons.

Browse Source 
Reviewed by: @Angen
Fixes #5269
Fixes #5095

Differential Revision: https://code.wildfiregames.com/D2651
This was SVN commit r24184.
This commit is contained in:
Stan
2020-11-14 18:16:24 +00:00
parent 6b5fe442c7
commit 10c3bcbf5f
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/gui/session/selection_panels.js
+15 -9
View File
@@ -235,7 +235,9 @@ g_SelectionPanels.Construction = {
});
data.button.onPress = function() { startBuildingPlacement(data.item, data.playerState); };
data.button.onPressRight = function() { showTemplateDetails(data.item); };
let showTemplateFunc = () => { showTemplateDetails(data.item); };
data.button.onPressRight = showTemplateFunc;
data.button.onPressRightDisabled = showTemplateFunc;
let tooltips = [
getEntityNamesFormatted,
@@ -772,11 +774,14 @@ g_SelectionPanels.Research = {
addResearchToQueue(data.item.researchFacilityId, t);
})(tech);
button.onPressRight = (t => function() {
let showTemplateFunc = (t => function() {
showTemplateDetails(
t,
GetTemplateData(data.unitEntStates.find(state => state.id == data.item.researchFacilityId).template).nativeCiv);
})(tech);
});
button.onPressRight = showTemplateFunc(tech);
button.onPressRightDisabled = showTemplateFunc(tech);
if (data.item.tech.pair)
{
@@ -976,9 +981,10 @@ g_SelectionPanels.Training = {
if (!neededResources)
addTrainingToQueue(unitIds, data.item, data.playerState);
};
data.button.onPressRight = function() {
showTemplateDetails(data.item);
};
let showTemplateFunc = () => { showTemplateDetails(data.item); };
data.button.onPressRight = showTemplateFunc;
data.button.onPressRightDisabled = showTemplateFunc;
data.countDisplay.caption = trainNum > 1 ? trainNum : "";
@@ -1161,9 +1167,9 @@ g_SelectionPanels.Upgrade = {
data.button.enabled = controlsPlayer(data.player);
data.button.tooltip = tooltip;
data.button.onPressRight = function() {
showTemplateDetails(data.item.entity);
};
let showTemplateFunc = () => { showTemplateDetails(data.item.entity); };
data.button.onPressRight = showTemplateFunc;
data.button.onPressRightDisabled = showTemplateFunc;
data.icon.sprite = modifier + "stretched:session/" +
(data.item.icon || "portraits/" + template.icon);
source/gui/ObjectBases/IGUIButtonBehavior.cpp
+2
View File
@@ -23,6 +23,7 @@
const CStr IGUIButtonBehavior::EventNamePress = "Press";
const CStr IGUIButtonBehavior::EventNamePressRight = "PressRight";
const CStr IGUIButtonBehavior::EventNamePressRightDisabled = "PressRightDisabled";
const CStr IGUIButtonBehavior::EventNameDoublePress = "DoublePress";
const CStr IGUIButtonBehavior::EventNameDoublePressRight = "DoublePressRight";
const CStr IGUIButtonBehavior::EventNameRelease = "Release";
@@ -114,6 +115,7 @@ void IGUIButtonBehavior::HandleMessage(SGUIMessage& Message)
case GUIM_MOUSE_PRESS_RIGHT:
if (!m_pObject.IsEnabled())
{
m_pObject.SendEvent(GUIM_PRESSED_MOUSE_RIGHT_DISABLED, EventNamePressRightDisabled);
m_pObject.PlaySound(m_SoundDisabled);
break;
}
source/gui/ObjectBases/IGUIButtonBehavior.h
+1
View File
@@ -62,6 +62,7 @@ public:
protected:
static const CStr EventNamePress;
static const CStr EventNamePressRight;
static const CStr EventNamePressRightDisabled;
static const CStr EventNameDoublePress;
static const CStr EventNameDoublePressRight;
static const CStr EventNameRelease;
source/gui/SGUIMessage.h
+1
View File
@@ -51,6 +51,7 @@ enum EGUIMessageType
GUIM_GOT_FOCUS,
GUIM_LOST_FOCUS,
GUIM_PRESSED_MOUSE_RIGHT,
GUIM_PRESSED_MOUSE_RIGHT_DISABLED,
GUIM_DOUBLE_PRESSED_MOUSE_RIGHT,
GUIM_PRESSED_MOUSE_RELEASE,
GUIM_PRESSED_MOUSE_RELEASE_RIGHT,