Skip to content
Snippets Groups Projects
Commit e61d7ac0 authored by andreykproductengine's avatar andreykproductengine
Browse files

MAINT-8833 EEP UI should be either responsive or indicate that it is disabled.

parent 26b6cc51
No related branches found
No related tags found
No related merge requests found
......@@ -331,8 +331,9 @@ void LLSlider::draw()
highlight_rect.set(track_rect.mLeft, track_rect.mTop, track_rect.mRight, track_rect.mBottom);
}
trackImage->draw(track_rect, LLColor4::white % alpha);
trackHighlightImage->draw(highlight_rect, LLColor4::white % alpha);
LLColor4 color = isInEnabledChain() ? LLColor4::white % alpha : LLColor4::white % (0.6f * alpha);
trackImage->draw(track_rect, color);
trackHighlightImage->draw(highlight_rect, color);
// Thumb
if (hasFocus())
......
......@@ -964,7 +964,6 @@ void LLFloaterEditExtDayCycle::setTabsData(LLTabContainer * tabcontainer, const
{
panel->setSettings(settings);
panel->setEnabled(editable);
panel->refresh();
panel->setAllChildrenEnabled(editable);
}
}
......
......@@ -112,6 +112,18 @@ BOOL LLPanelSettingsSkyAtmosTab::postBuild()
return TRUE;
}
//virtual
void LLPanelSettingsSkyAtmosTab::setEnabled(BOOL enabled)
{
LLPanelSettingsSky::setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_HAZE_HORIZON)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_HAZE_DENSITY)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_SCENE_GAMMA)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_DENSITY_MULTIP)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_DISTANCE_MULTIP)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_MAX_ALT)->setEnabled(enabled);
}
void LLPanelSettingsSkyAtmosTab::refresh()
{
if (!mSkySettings)
......@@ -211,6 +223,20 @@ BOOL LLPanelSettingsSkyCloudTab::postBuild()
return TRUE;
}
//virtual
void LLPanelSettingsSkyCloudTab::setEnabled(BOOL enabled)
{
LLPanelSettingsSky::setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_CLOUD_COVERAGE)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_CLOUD_SCALE)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_CLOUD_DENSITY_X)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_CLOUD_DENSITY_Y)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_CLOUD_DENSITY_D)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_CLOUD_DETAIL_X)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_CLOUD_DETAIL_Y)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_CLOUD_DETAIL_D)->setEnabled(enabled);
}
void LLPanelSettingsSkyCloudTab::refresh()
{
if (!mSkySettings)
......@@ -315,6 +341,15 @@ BOOL LLPanelSettingsSkySunMoonTab::postBuild()
return TRUE;
}
//virtual
void LLPanelSettingsSkySunMoonTab::setEnabled(BOOL enabled)
{
LLPanelSettingsSky::setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_GLOW_FOCUS)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_GLOW_SIZE)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_SKY_STAR_BRIGHTNESS)->setEnabled(enabled);
}
void LLPanelSettingsSkySunMoonTab::refresh()
{
if (!mSkySettings)
......
......@@ -62,6 +62,7 @@ class LLPanelSettingsSkyAtmosTab : public LLPanelSettingsSky
LLPanelSettingsSkyAtmosTab();
virtual BOOL postBuild() override;
virtual void setEnabled(BOOL enabled);
protected:
virtual void refresh() override;
......@@ -86,6 +87,7 @@ class LLPanelSettingsSkyCloudTab : public LLPanelSettingsSky
LLPanelSettingsSkyCloudTab();
virtual BOOL postBuild() override;
virtual void setEnabled(BOOL enabled);
protected:
virtual void refresh() override;
......@@ -108,6 +110,7 @@ class LLPanelSettingsSkySunMoonTab : public LLPanelSettingsSky
LLPanelSettingsSkySunMoonTab();
virtual BOOL postBuild() override;
virtual void setEnabled(BOOL enabled);
protected:
virtual void refresh() override;
......
......@@ -107,6 +107,24 @@ BOOL LLPanelSettingsWaterMainTab::postBuild()
return TRUE;
}
//virtual
void LLPanelSettingsWaterMainTab::setEnabled(BOOL enabled)
{
LLPanelSettingsWater::setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_FOG_DENSITY)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_UNDERWATER_MOD)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_FRESNEL_SCALE)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_FRESNEL_OFFSET)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_NORMAL_SCALE_X)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_NORMAL_SCALE_Y)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_NORMAL_SCALE_Z)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_SCALE_ABOVE)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_SCALE_BELOW)->setEnabled(enabled);
getChild<LLUICtrl>(FIELD_WATER_BLUR_MULTIP)->setEnabled(enabled);
}
//==========================================================================
void LLPanelSettingsWaterMainTab::refresh()
{
......
......@@ -66,6 +66,7 @@ class LLPanelSettingsWaterMainTab : public LLPanelSettingsWater
LLPanelSettingsWaterMainTab();
virtual BOOL postBuild() override;
virtual void setEnabled(BOOL enabled);
protected:
virtual void refresh() override;
......
indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png

475 B | W: | H:

indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png

429 B | W: | H:

indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png
  • 2-up
  • Swipe
  • Onion skin
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment