From e018ecf4696aa17c7696c2b8f8bed2ac2d149eae Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 27 Oct 2009 15:01:09 -0700 Subject: EXT-1352 First pass background images for floaters and panels, including pretty header. Reviewed with Leyla. --- indra/newview/skins/default/textures/textures.xml | 6 ++++-- .../default/textures/windows/Window_Background.png | Bin 950 -> 509 bytes .../default/textures/windows/Window_Foreground.png | Bin 959 -> 508 bytes 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 4d54838225..f9842526dd 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -471,8 +471,10 @@ - - + + diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png index e9f15e76b9..db253900af 100644 Binary files a/indra/newview/skins/default/textures/windows/Window_Background.png and b/indra/newview/skins/default/textures/windows/Window_Background.png differ diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png index e76e9f3c79..b81ec5b43c 100644 Binary files a/indra/newview/skins/default/textures/windows/Window_Foreground.png and b/indra/newview/skins/default/textures/windows/Window_Foreground.png differ -- cgit v1.2.3 From c3571b61fa8493b4298a6b1dc1f595a4077d1716 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 27 Oct 2009 15:04:04 -0700 Subject: Renamed Toast.png to Toast_Background.png for consistency with Window and Inspector background images. --- indra/newview/skins/default/textures/textures.xml | 2 +- .../skins/default/textures/windows/Toast_Background.png | Bin 0 -> 414 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/windows/Toast_Background.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index f9842526dd..f33121b163 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -437,7 +437,7 @@ - + diff --git a/indra/newview/skins/default/textures/windows/Toast_Background.png b/indra/newview/skins/default/textures/windows/Toast_Background.png new file mode 100644 index 0000000000..feeee78033 Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Toast_Background.png differ -- cgit v1.2.3 From 7f4d3266382b29d9dcba9dee2c1e279aa4639b9e Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 27 Oct 2009 16:27:26 -0700 Subject: EXT-1352 Use image backgrounds for inspectors and toasts. Art only, not reviewed. --- indra/newview/skins/default/textures/textures.xml | 6 ++++-- .../default/textures/windows/Inspector_Background.png | Bin 400 -> 348 bytes .../skins/default/textures/windows/Toast_Background.png | Bin 414 -> 349 bytes 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index f33121b163..b6215982e2 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -147,7 +147,8 @@ - + @@ -437,7 +438,8 @@ - + diff --git a/indra/newview/skins/default/textures/windows/Inspector_Background.png b/indra/newview/skins/default/textures/windows/Inspector_Background.png index 807e8e553c..4c2a728ac5 100644 Binary files a/indra/newview/skins/default/textures/windows/Inspector_Background.png and b/indra/newview/skins/default/textures/windows/Inspector_Background.png differ diff --git a/indra/newview/skins/default/textures/windows/Toast_Background.png b/indra/newview/skins/default/textures/windows/Toast_Background.png index feeee78033..f27d1a12ec 100644 Binary files a/indra/newview/skins/default/textures/windows/Toast_Background.png and b/indra/newview/skins/default/textures/windows/Toast_Background.png differ -- cgit v1.2.3 From 432e243e1aca565ea19091d39f1ff33056ce4075 Mon Sep 17 00:00:00 2001 From: James Cook Date: Thu, 29 Oct 2009 15:37:25 -0700 Subject: EXT-1352 Add image art to floater backgrounds. Implemented "legacy_header_height" hack to account for new art being 25 pixels tall instead of legacy 18 pixels -- it auto-sizes the floaters to be taller. Made all floaters have resize handles, just disable and make invisible if unused. This simplifies the floater construction logic. Floater header height now lives in floater.xml, not as a global saved setting. Reviewed with Richard. --- indra/newview/skins/default/textures/textures.xml | 8 ++++---- .../textures/windows/Window_NoTitle_Background.png | Bin 0 -> 289 bytes .../textures/windows/Window_NoTitle_Foreground.png | Bin 0 -> 290 bytes 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png create mode 100644 indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png (limited to 'indra/newview/skins/default/textures') diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 4f07d25b25..3d1cb84993 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -477,10 +477,10 @@ scale.left="4" scale.top="24" scale.right="26" scale.bottom="4" /> - - - - + + diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png new file mode 100644 index 0000000000..a570ac06bd Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Window_NoTitle_Background.png differ diff --git a/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png new file mode 100644 index 0000000000..d573e8c69a Binary files /dev/null and b/indra/newview/skins/default/textures/windows/Window_NoTitle_Foreground.png differ -- cgit v1.2.3