livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Layout tweaks of the social floater

meow-7.2.2
Merov Linden 2013-07-09 16:59:10 -07:00
parent d869e706b8
commit 073a7f5096
5 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloatersocial.cpp
View File

@ -199,7 +199,6 @@ void LLSocialPhotoPanel::draw()
if (previewp && previewp->getThumbnailImage())
{
const LLRect& thumbnail_rect = mThumbnailPlaceholder->getRect();
const LLRect& snapshot_rect = mSnapshotPanel->getRect();
const S32 thumbnail_w = previewp->getThumbnailWidth();
const S32 thumbnail_h = previewp->getThumbnailHeight();
@ -208,7 +207,8 @@ void LLSocialPhotoPanel::draw()
// calc preview offset within the floater rect
S32 offset_x = thumbnail_rect.mLeft + local_offset_x;
S32 offset_y = thumbnail_rect.mBottom - (snapshot_rect.mTop - thumbnail_rect.mTop);
// Hack : "15" is to compensate for "top=8" of "stack_photo" and "top=7" of "tabs"
S32 offset_y = thumbnail_rect.mBottom - 15;
mSnapshotPanel->localPointToOtherView(offset_x, offset_y, &offset_x, &offset_y, getParentByType<LLFloater>());

19
indra/newview/skins/default/xui/en/floater_social.xml
View File

@ -11,7 +11,7 @@
single_instance="true"
reuse_instance="true"
title="FACEBOOK"
height="437"
height="450"
width="304">
<tab_container
name="tabs"
@ -19,16 +19,16 @@
tab_min_width="70"
tab_height="30"
tab_position="top"
background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
top="7"
height="395"
height="430"
halign="center">
<panel
filename="panel_social_status.xml"
class="llsocialstatuspanel"
follows="all"
background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
label="STATUS"
help_topic="panel_social_status"
name="panel_social_status"/>
@ -43,9 +43,6 @@
filename="panel_social_place.xml"
class="llsocialcheckinpanel"
follows="all"
background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
label="PLACE"
help_topic="panel_social_place"
name="panel_social_place"/>
@ -53,8 +50,10 @@
<panel
name="connection_status_panel"
follows="left|top"
height="26"
top_pad="-30">
background_visible="true"
bg_alpha_color="DkGray"
bg_opaque_color="DkGray"
height="24">
<text
name="connection_error_text"
type="string"

31
indra/newview/skins/default/xui/en/panel_social_photo.xml
View File

@ -1,28 +1,20 @@
<panel
height="395"
height="393"
width="304"
layout="topleft"
name="panel_social_photo">
<layout_stack
layout="topleft"
border_size="0"
height="395"
height="385"
follows="top|left|right"
orientation="vertical"
name="stack_photo"
top="8">
<layout_panel
name="photo_detail_panel"
height="295">
<panel
top="0"
follows="all"
height="295"
width="286"
left="7"
label="snapshot_panel"
help_topic="snapshot_panel"
name="snapshot_panel">
name="snapshot_panel"
top="0"
height="360">
<combo_box
control_name="SocialPhotoResolution"
follows="left|top"
@ -103,13 +95,13 @@
height="16"
left="9"
name="caption_label"
top_pad="12"
top_pad="5"
type="string">
Comment (optional):
</text>
<text_editor
follows="left|top"
height="47"
height="87"
width="250"
left="9"
length="1"
@ -123,15 +115,16 @@
initial_value="true"
label="Include location in posting"
name="add_location_cb"
top_pad="19"/>
</panel>
left="6"
height="16"
top_pad="5"/>
</layout_panel>
<layout_panel
name="photo_button_panel"
height="96">
height="25">
<button
follows="left|top"
top="32"
top="0"
left="9"
height="23"
label="Post"

12
indra/newview/skins/default/xui/en/panel_social_place.xml
View File

@ -1,19 +1,19 @@
<panel
height="395"
height="393"
width="304"
layout="topleft"
name="panel_social_place">
<layout_stack
layout="topleft"
border_size="0"
height="395"
height="385"
follows="all"
orientation="vertical"
name="stack_place"
top="8">
<layout_panel
name="place_detail_panel"
height="122">
height="127">
<text
length="1"
follows="top|left|right"
@ -39,7 +39,7 @@
</layout_panel>
<layout_panel
name="place_map_panel"
height="133">
height="233">
<loading_indicator
follows="left|top"
height="24"
@ -81,10 +81,10 @@
</layout_panel>
<layout_panel
name="place_button_panel"
height="96">
height="25">
<button
follows="left|top"
top="40"
top="0"
left="9"
height="23"
label="Post"

10
indra/newview/skins/default/xui/en/panel_social_status.xml
View File

@ -1,19 +1,19 @@
<panel
height="395"
height="393"
width="304"
layout="topleft"
name="panel_social_status">
<layout_stack
layout="topleft"
border_size="0"
height="395"
height="385"
follows="all"
orientation="vertical"
name="stack_status"
top="8">
<layout_panel
name="status_detail_panel"
height="40">
height="360">
<text
length="1"
follows="top|left|right"
@ -39,10 +39,10 @@
</layout_panel>
<layout_panel
name="status_button_panel"
height="96">
height="25">
<button
follows="left|top"
top="213"
top="0"
left="9"
height="23"
label="Post"