Skip to content

#2655 update alpha gamma drop down position #2663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 24, 2024
Merged

#2655 update alpha gamma drop down position #2663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44344e8
#2655 update alpha gamma drop down position
maxim-productengine Sep 24, 2024
947169b
Don't disable alpha gamma ctrl
maxim-productengine Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion indra/newview/llpanelface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ bool LLPanelFace::postBuild()

getChildSetCommitCallback(mCheckFullbright, "checkbox fullbright", [&](LLUICtrl*, const LLSD&) { onCommitFullbright(); });

mLabelTexGen = getChild<LLTextBox>("alpha gamma");
mLabelAlphaGamma = getChild<LLTextBox>("alpha gamma");
getChildSetCommitCallback(mComboAlphaGamma, "combobox alpha gamma", [&](LLUICtrl *, const LLSD &) { onCommitAlphaGamma(); });
mComboAlphaGamma->setFollows(FOLLOWS_LEFT | FOLLOWS_TOP);

Expand Down Expand Up @@ -2846,6 +2846,7 @@ void LLPanelFace::updateVisibility(LLViewerObject* objectp /* = nullptr */)
// Shared material controls
mComboAlphaGamma->setVisible(true);
mComboAlphaGamma->setEnabled(true);
mLabelAlphaGamma->setEnabled(true);
mCheckSyncSettings->setVisible(show_material || show_media);
mLabelTexGen->setVisible(show_material || show_media || show_pbr_asset);
mComboTexGen->setVisible(show_material || show_media || show_pbr_asset);
Expand Down
1 change: 1 addition & 0 deletions indra/newview/llpanelface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ class LLPanelFace : public LLPanel
LLTextBox* mLabelTexGen { nullptr };
LLComboBox* mComboTexGen { nullptr };

LLTextBox* mLabelAlphaGamma{ nullptr };
LLComboBox *mComboAlphaGamma {nullptr};

LLRadioGroup* mRadioMaterialType { nullptr };
Expand Down
72 changes: 36 additions & 36 deletions indra/newview/skins/default/xui/en/panel_tools_texture.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,39 +641,6 @@
tool_tip="Click to open color picker"
top_delta="-4"
width="64" />
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left="10"
name="alpha gamma"
text_readonly_color="LabelDisabledColor"
top_pad="46"
width="140">
Alpha Gamma
</text>
<combo_box
height="23"
layout="topleft"
left_pad="0"
name="combobox alpha gamma"
top_pad="-13"
width="125">
<combo_box.item
label="Linear"
name="Linear"
value="100" />
<combo_box.item
label="Inverse Gamma"
name="Inverse Gamma"
value="45" />
<combo_box.item
label="Gamma"
name="Gamma"
value="220" />
</combo_box>
<text
follows="left|top|right"
height="9"
Expand Down Expand Up @@ -717,6 +684,39 @@
top_delta="0"
tool_tip="Align media texture (must load first)"
width="85" />
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left="10"
name="alpha gamma"
text_readonly_color="LabelDisabledColor"
top_pad="45"
width="140">
Alpha Gamma
</text>
<combo_box
height="23"
layout="topleft"
left_pad="0"
name="combobox alpha gamma"
top_pad="-13"
width="125">
<combo_box.item
label="Linear"
name="Linear"
value="100" />
<combo_box.item
label="Inverse Gamma"
name="Inverse Gamma"
value="45" />
<combo_box.item
label="Gamma"
name="Gamma"
value="220" />
</combo_box>
<text
type="string"
length="1"
Expand All @@ -726,7 +726,7 @@
left="10"
name="tex gen"
text_readonly_color="LabelDisabledColor"
top_pad="46"
top_pad="4"
width="140">
Mapping
</text>
Expand Down Expand Up @@ -959,7 +959,7 @@
left="7"
name="checkbox planar align"
tool_tip="Align textures on all selected faces with the last selected face. Requires Planar texture mapping."
top_delta="20"
top_delta="16"
width="260" />
<button
follows="left|top"
Expand Down Expand Up @@ -996,7 +996,7 @@
min_val="-100"
max_val="100"
name="gltfTextureScaleU"
top_delta="34"
top_delta="64"
width="265" />
<spinner
follows="left|top"
Expand Down
Loading