From fcb7bae747622ec861a7d222176aa77b9f0c9856 Mon Sep 17 00:00:00 2001
From: mobserveur <mobserveur@gmail.co[alias]>
Date: Sat, 15 Feb 2025 12:12:46 +0100
Subject: smaller camera floater
redesigned camera floater so it's smaller
---
indra/newview/llfloatercamera.cpp | 2 +-
.../textures/bottomtray/Cam_Rotate_Center.png | Bin 5117 -> 4436 bytes
.../default/textures/bottomtray/Cam_Rotate_In.png | Bin 5134 -> 4711 bytes
.../default/textures/bottomtray/Cam_Rotate_Out.png | Bin 3271 -> 8388 bytes
.../textures/bottomtray/Cam_Tracking_Center.png | Bin 5113 -> 4521 bytes
.../textures/bottomtray/Cam_Tracking_In.png | Bin 5060 -> 4521 bytes
.../textures/bottomtray/Cam_Tracking_Out.png | Bin 787 -> 5711 bytes
.../skins/default/xui/en/floater_camera.xml | 146 +++++++++++----------
8 files changed, 79 insertions(+), 69 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 76ac730362..8a15f1a34a 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -753,5 +753,5 @@ void LLFloaterCamera::updateCollapsedView()
mCollapseCtrl->setImageOverlay(!isCollapsed ? "Conv_toolbar_collapse" : "Conv_toolbar_expand");
getChild<LLPanel>("buttons_panel")->setVisible(!isCollapsed);
//mPreciseCtrls->setVisible(!collapse);
- reshape(!isCollapsed ? 410 : 220, getRect().getHeight(), FALSE);
+ reshape(!isCollapsed ? 362 : 172, getRect().getHeight(), FALSE);
}
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png
index 90389734e5..446daf6a90 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png
index a540674662..479c98903e 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png
index b09f7c64d3..cc4e6f99ff 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Out.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png
index a507127fda..dbafbcc9f0 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png
index 61b1085e96..041a42ecf9 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png differ
diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png
index c5cd8cca92..cffead1703 100644
Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Out.png differ
diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 44a5638bc4..4f45625828 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -8,7 +8,7 @@
can_minimize="false"
can_collapse="false"
can_close="true"
- width="410"
+ width="370"
height="114"
layout="topleft"
name="camera_floater"
@@ -37,29 +37,28 @@
<string name="inactive_combo_text">Use preset</string>
<panel
border="false"
- width="220"
- height="90"
+ width="168"
+ height="96"
layout="topleft"
left="2"
top="18"
mouse_opaque="false"
name="controls"
- >
- <!--TODO: replace + - images -->
+ >
<panel
border="false"
class="camera_zoom_panel"
- height="90"
+ height="76"
layout="topleft"
left="0"
mouse_opaque="false"
name="zoom"
top="0"
- width="220">
+ width="168">
<joystick_rotate
follows="top|left"
- width="78"
- height="78"
+ width="60"
+ height="60"
layout="topleft"
left="7"
top="8"
@@ -70,72 +69,26 @@
scale_image="true"
tool_tip="Orbit camera around focus"
/>
- <button
+ <joystick_track
follows="top|left"
- width="18"
- height="18"
+ width="60"
+ height="60"
left_pad="4"
- top="2"
- layout="topleft"
- image_disabled="AddItem_Disabled"
- image_selected="AddItem_Press"
- image_unselected="AddItem_Off"
- name="zoom_plus_btn"
- >
- <commit_callback
- function="Zoom.plus" />
- <mouse_held_callback
- function="Zoom.plus" />
- </button>
- <slider_bar
- width="18"
- height="50"
- top_pad="0"
- layout="topleft"
- name="zoom_slider"
- orientation="vertical"
- tool_tip="Zoom camera toward focus"
- min_val="0"
- max_val="1"
- >
- <commit_callback function="Slider.value_changed"/>
- </slider_bar>
- <button
- follows="top|left"
- width="18"
- height="18"
- top_pad="0"
+ image_selected="Cam_Tracking_In"
+ image_unselected="Cam_Tracking_Out"
layout="topleft"
- image_disabled="MinusItem_Disabled"
- image_selected="MinusItem_Press"
- image_unselected="MinusItem_Off"
- name="zoom_minus_btn"
- >
- <commit_callback
- function="Zoom.minus" />
- <mouse_held_callback
- function="Zoom.minus" />
- </button>
- <joystick_track
- follows="top|left"
- width="78"
- height="78"
- left_pad="4"
- image_selected="Cam_Tracking_In"
- image_unselected="Cam_Tracking_Out"
- layout="topleft"
- name="cam_track_stick"
- quadrant="left"
- scale_image="true"
- sound_flags="3"
- tool_tip="Move camera up and down, left and right"
- />
+ name="cam_track_stick"
+ quadrant="left"
+ scale_image="true"
+ sound_flags="3"
+ tool_tip="Move camera up and down, left and right"
+ />
<button
follows="top|left"
width="18"
height="18"
top="8"
- left_pad="6"
+ left_pad="8"
layout="topleft"
name="collapse_btn"
>
@@ -154,10 +107,67 @@
>
</button>
</panel>
+ <panel
+ border="false"
+ class="camera_zoom_panel"
+ height="18"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="zoom"
+ top_pad="0"
+ width="150">
+ <button
+ follows="top|left"
+ width="18"
+ height="18"
+ left="2"
+ top="0"
+ layout="topleft"
+ image_disabled="MinusItem_Disabled"
+ image_selected="MinusItem_Press"
+ image_unselected="MinusItem_Off"
+ name="zoom_minus_btn"
+ >
+ <commit_callback
+ function="Zoom.minus" />
+ <mouse_held_callback
+ function="Zoom.minus" />
+ </button>
+ <slider_bar
+ width="100"
+ height="18"
+ left_pad="2"
+ layout="topleft"
+ name="zoom_slider"
+ orientation="horizontal"
+ tool_tip="Zoom camera toward focus"
+ min_val="0"
+ max_val="1"
+ >
+ <commit_callback function="Slider.value_changed"/>
+ </slider_bar>
+ <button
+ follows="bottom|left"
+ width="18"
+ height="18"
+ left_pad="2"
+ layout="topleft"
+ image_disabled="AddItem_Disabled"
+ image_selected="AddItem_Press"
+ image_unselected="AddItem_Off"
+ name="zoom_plus_btn"
+ >
+ <commit_callback
+ function="Zoom.plus" />
+ <mouse_held_callback
+ function="Zoom.plus" />
+ </button>
+ </panel>
</panel>
<panel
follows="left|top"
- height="90"
+ height="110"
layout="topleft"
left_pad="2"
right="-2"
--
cgit v1.2.3