Skip to content
Snippets Groups Projects
Commit 4964ca39 authored by Eric M. Tulla (BigPapi)'s avatar Eric M. Tulla (BigPapi)
Browse files

EXT-2703: tex preview bug ui/buttons weren't visible or would appear off floater

parent 0e729489
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llpreviewtexture.cpp
+ 2
− 2
View file @ 4964ca39
...@@ -422,8 +422,8 @@ void LLPreviewTexture::updateDimensions() ...@@ -422,8 +422,8 @@ void LLPreviewTexture::updateDimensions()
if (mShowKeepDiscard || mCopyToInv) { //mCopyToInvBtn if (mShowKeepDiscard || mCopyToInv) { //mCopyToInvBtn
// add space for buttons // add space for buttons
view_height += BTN_HEIGHT + CLIENT_RECT_VPAD; view_height += (BTN_HEIGHT + CLIENT_RECT_VPAD) * 3;
button_height = BTN_HEIGHT + PREVIEW_PAD; button_height = (BTN_HEIGHT + PREVIEW_PAD) * 3;
} }
view_width = llmax(view_width, getMinWidth()); view_width = llmax(view_width, getMinWidth());
......
indra/newview/skins/default/xui/en/floater_preview_texture.xml
+ 4
− 4
View file @ 4964ca39
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
auto_tile="true" auto_tile="true"
can_resize="true" can_resize="true"
follows="left|top" follows="left|top"
height="313" height="350"
layout="topleft" layout="topleft"
min_height="120" min_height="200"
min_width="320" min_width="370"
name="preview_texture" name="preview_texture"
help_topic="preview_texture" help_topic="preview_texture"
width="320"> width="370">
<floater.string <floater.string
name="Title"> name="Title">
Texture: [NAME] Texture: [NAME]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment