Skip to content

Commit

Permalink
gui opt fix
Browse files Browse the repository at this point in the history
  • Loading branch information
cryham committed Sep 18, 2024
1 parent c3f1b51 commit 14be143
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions data/gui/Editor_Options.layout
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,11 @@
<!-- 🌊 Water -->
<Widget type="TabItem" skin="" position="2 24 694 272">
<Property key="Caption" value="#60B0FF#{Water}"/>
<Widget type="Button" skin="Button" position="32 240 200 26" layer="Back" name="ApplyShadersWater">
<!-- <Widget type="Button" skin="Button" position="32 240 200 26" layer="Back" name="ApplyShadersWater">
<Property key="Caption" value="#{Apply} ="/>
<Property key="Colour" value="0.5 0.75 1.0"/>
<Property key="TextColour" value="0.5 0.75 1.0"/>
</Widget>
</Widget> -->
<Widget type="Button" skin="CheckBox" position="32 48 250 24" name="WaterReflection">
<Property key="Caption" value="#{WaterReflection} *"/>
<Property key="TextColour" value="0.6 0.8 1"/>
Expand Down
4 changes: 2 additions & 2 deletions data/gui/Game_Options.layout
Original file line number Diff line number Diff line change
Expand Up @@ -959,11 +959,11 @@
<!-- 🌊 Water -->
<Widget type="TabItem" skin="" position="2 24 694 272">
<Property key="Caption" value="#60B0FF#{Water}"/>
<Widget type="Button" skin="Button" position="32 240 200 26" layer="Back" name="ApplyShadersWater">
<!-- <Widget type="Button" skin="Button" position="32 240 200 26" layer="Back" name="ApplyShadersWater">
<Property key="Caption" value="#{Apply} ="/>
<Property key="Colour" value="0.5 0.75 1.0"/>
<Property key="TextColour" value="0.5 0.75 1.0"/>
</Widget>
</Widget> -->
<Widget type="Button" skin="CheckBox" position="32 48 250 24" name="WaterReflection">
<Property key="Caption" value="#{WaterReflection} *"/>
<Property key="TextColour" value="0.6 0.8 1"/>
Expand Down
2 changes: 1 addition & 1 deletion src/common/GuiCom_Options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void CGuiCom::GuiInitGraphics() // ? not yet: called on preset change with bGI
sv= &svWaterDist; sv->Init("WaterDist", &pSet->g.water_dist, 20.f,maxDist, 4.f, 1,4, 0.001f, TR(" #{UnitKm}"));
SevC(WaterDist); sv->DefaultF(1000.f);
sv= &svWaterLod; sv->Init("WaterLod", &pSet->g.water_lod, 0.01f,2.f, 2.f); sv->DefaultF(0.4f);
BtnC("ApplyShadersWater", btnWaterApply);
// BtnC("ApplyShadersWater", btnWaterApply);


// 📊 Presets
Expand Down
2 changes: 1 addition & 1 deletion src/game/SceneInit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ void App::LoadCleanUp()
// compositor goes bad, wont restore
if (pSet->game.local_players > 1 &&
pSet->g.water_refract > 0)
pSet->g.water_refract = 0;
{ pSet->g.water_refract = 0; gcom->ckWaterRefract.Upd(); }

SetupCompositor(); //+ ok
}
Expand Down

0 comments on commit 14be143

Please sign in to comment.