From 92db224e8624c22eb9e8516662685c68cb819e69 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 25 Aug 2010 16:46:37 -0700 Subject: fixed regressions from changing layout panel to be a derived widget class --- indra/newview/llbottomtray.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'indra/newview/llbottomtray.h') diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 05fed53936..792355600b 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -33,20 +33,17 @@ #ifndef LL_LLBOTTOMPANEL_H #define LL_LLBOTTOMPANEL_H -#include "llmenugl.h" - #include "llpanel.h" #include "llimview.h" -#include "llcombobox.h" class LLChicletPanel; -class LLLineEditor; class LLLayoutStack; -class LLNotificationChiclet; class LLSpeakButton; class LLNearbyChatBar; class LLIMChiclet; class LLBottomTrayLite; +class LLLayoutPanel; +class LLMenuGL; // Build time optimization, generate once in .cpp file #ifndef LLBOTTOMTRAY_CPP @@ -381,6 +378,7 @@ protected: LLPanel* mSpeakPanel; LLSpeakButton* mSpeakBtn; LLNearbyChatBar* mNearbyChatBar; + LLLayoutPanel* mChatBarContainer; LLLayoutStack* mToolbarStack; LLMenuGL* mBottomTrayContextMenu; LLButton* mCamButton; -- cgit v1.2.3 From 83bb4b9518da813a42e49366cea15e5ae9dc7507 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 16 Sep 2010 22:10:30 -0700 Subject: fixed merge --- indra/newview/llbottomtray.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llbottomtray.h') diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 35e00924aa..6225d4c92c 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -29,6 +29,7 @@ #include "llpanel.h" #include "llimview.h" +#include "llbutton.h" class LLChicletPanel; class LLLayoutStack; -- cgit v1.2.3 From 949b60465593764118c03d0f4e112f69c41bab31 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 17 Sep 2010 15:01:44 -0700 Subject: Backed out changeset: d71309f8bd0e --- indra/newview/llbottomtray.h | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llbottomtray.h') diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 6225d4c92c..35e00924aa 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -29,7 +29,6 @@ #include "llpanel.h" #include "llimview.h" -#include "llbutton.h" class LLChicletPanel; class LLLayoutStack; -- cgit v1.2.3 From 1fc63c8da1e8244fdd0cfd59b88102c9ffbf7ca6 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 17 Sep 2010 15:14:42 -0700 Subject: fixed build (again) --- indra/newview/llbottomtray.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llbottomtray.h') diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 35e00924aa..6225d4c92c 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -29,6 +29,7 @@ #include "llpanel.h" #include "llimview.h" +#include "llbutton.h" class LLChicletPanel; class LLLayoutStack; -- cgit v1.2.3 From 2a1d4b375efdc32145908e0112fd9b8dc308b5bf Mon Sep 17 00:00:00 2001 From: Andrew Productengine Date: Wed, 22 Sep 2010 18:20:01 +0300 Subject: STORM-187 FIXED Fixed chatbar not getting back its width after opening/closing sidetray. The bug reproduced not only for opening/closing sidetray, but also when viewer window was resized. The chatbar's width was set to default on width increase, it was also shrunk even when there was enough space for it, and buttons could be shrunk instead. Also, width to which user resized it manually, was not used in resizes. Gave priority on resizes to nearby chat - i.e.: Before this fix priorities were- buttons are visible -> buttons are as wide as possible -> nearby is stretched. After this fix priorities are- buttons are visible -> nearby is stretched -> buttons are as wide as possible. - Added new member which stores width of nearbychat(either value that was recorded after user's manual resize of chatbar or default). Used it as a value to which chatbar tries to be resized on resizes. - Implemented the change of priorities described above in processWidthIncreased() and processWidthDecreased() methods. --- indra/newview/llbottomtray.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llbottomtray.h') diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 1197c5a10a..e6c6f66f33 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -439,6 +439,10 @@ protected: void onContextMenuItemClicked(const LLSD& userdata); bool onContextMenuItemEnabled(const LLSD& userdata); + // Either default or saved after user's manual resize width of nearby chat. + // Nearby chat will not always have it, because sometimes it can be shrunk on resize, + // but when possible it will be restored back to this value. + S32 mDesiredNearbyChatWidth; LLChicletPanel* mChicletPanel; LLPanel* mSpeakPanel; LLSpeakButton* mSpeakBtn; -- cgit v1.2.3