Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Update the water height slider if the water height is set using the picker.

Browse Source 
Patch by: @phosit
Fixes: #6424
Differential Revision: https://code.wildfiregames.com/D4576
This was SVN commit r26727.
This commit is contained in:
Stan 2022-03-28 22:36:17 +00:00
parent a33e0ccc84
commit 8f85f24608
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binaries/data/mods/public/gui/credits/texts/programming.json
View File

@ -210,6 +210,7 @@
{ "nick": "pcpa", "name": "Paulo Andrade" },
{ "nick": "Pendingchaos" },
{ "nick": "PeteVasi", "name": "Pete Vasiliauskas" },
{ "nick": "phosit" },
{ "nick": "pilino1234" },
{ "nick": "PingvinBetyar", "name": "Schronk Tamás" },
{ "nick": "plugwash", "name": "Peter Michael Green" },

21
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/PickWaterHeight.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2019 Wildfire Games.
/* Copyright (C) 2022 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -29,13 +29,8 @@ class PickWaterHeight : public StateDrivenTool<PickWaterHeight>
{
DECLARE_DYNAMIC_CLASS(PickWaterHeight);
// Uses a workaround to notify the environment settings directly, because
// we don't have any way to update them on the engine state change.
EnvironmentSidebar* m_Sidebar;
public:
PickWaterHeight()
: m_Sidebar(nullptr)
{
SetState(&Waiting);
}
@ -45,22 +40,20 @@ public:
StateDrivenTool<PickWaterHeight>::Init(initData, scenarioEditor);
wxASSERT(initData);
m_Sidebar = static_cast<EnvironmentSidebar*>(initData);
}
void OnDisable()
{
if (m_Sidebar)
m_Sidebar->UpdateEnvironmentSettings();
Waiting.m_Sidebar = static_cast<EnvironmentSidebar*>(initData);
}
struct sWaiting : public State
{
// Uses a workaround to notify the environment settings directly, because
// we don't have any way to update them on the engine state change.
EnvironmentSidebar* m_Sidebar = nullptr;
bool OnMouse(PickWaterHeight* WXUNUSED(obj), wxMouseEvent& evt)
{
if (evt.LeftDown())
if (evt.LeftDown() && m_Sidebar)
{
POST_COMMAND(PickWaterHeight, (evt.GetPosition()));
m_Sidebar->UpdateEnvironmentSettings();
return true;
}
return false;