diff options
Diffstat (limited to 'linden/indra/llui/llfloater.h')
-rw-r--r-- | linden/indra/llui/llfloater.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h index 4826648..25b2697 100644 --- a/linden/indra/llui/llfloater.h +++ b/linden/indra/llui/llfloater.h | |||
@@ -122,7 +122,7 @@ public: | |||
122 | virtual EWidgetType getWidgetType() const; | 122 | virtual EWidgetType getWidgetType() const; |
123 | virtual LLString getWidgetTag() const; | 123 | virtual LLString getWidgetTag() const; |
124 | 124 | ||
125 | virtual void open(); | 125 | virtual void open(); /* Flawfinder: ignore */ |
126 | 126 | ||
127 | // If allowed, close the floater cleanly, releasing focus. | 127 | // If allowed, close the floater cleanly, releasing focus. |
128 | // app_quitting is passed to onClose() below. | 128 | // app_quitting is passed to onClose() below. |
@@ -176,6 +176,9 @@ public: | |||
176 | 176 | ||
177 | virtual void draw(); | 177 | virtual void draw(); |
178 | 178 | ||
179 | // does nothing by default | ||
180 | virtual void onOpen(); | ||
181 | |||
179 | // Call destroy() to free memory, or setVisible(FALSE) to keep it | 182 | // Call destroy() to free memory, or setVisible(FALSE) to keep it |
180 | // If app_quitting, you might not want to save your visibility. | 183 | // If app_quitting, you might not want to save your visibility. |
181 | // Defaults to destroy(). | 184 | // Defaults to destroy(). |
@@ -197,9 +200,8 @@ public: | |||
197 | void clearSnapTarget() { mSnappedTo.markDead(); } | 200 | void clearSnapTarget() { mSnappedTo.markDead(); } |
198 | LLViewHandle getSnapTarget() { return mSnappedTo; } | 201 | LLViewHandle getSnapTarget() { return mSnappedTo; } |
199 | 202 | ||
200 | /*virtual*/ LLView* getRootMostFastFrameView(); | 203 | static void closeFocusedFloater(); |
201 | 204 | ||
202 | static void closeByMenu(void *userdata); | ||
203 | static void onClickClose(void *userdata); | 205 | static void onClickClose(void *userdata); |
204 | static void onClickMinimize(void *userdata); | 206 | static void onClickMinimize(void *userdata); |
205 | static void onClickTearOff(void *userdata); | 207 | static void onClickTearOff(void *userdata); |
@@ -356,12 +358,8 @@ public: | |||
356 | LLMultiFloater(const LLString& name, const LLString& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = FALSE); | 358 | LLMultiFloater(const LLString& name, const LLString& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = FALSE); |
357 | virtual ~LLMultiFloater(); | 359 | virtual ~LLMultiFloater(); |
358 | 360 | ||
359 | virtual void init(const LLString& title, BOOL resizable, | ||
360 | S32 min_width, S32 min_height, BOOL drag_on_left, | ||
361 | BOOL minimizable, BOOL close_btn); | ||
362 | |||
363 | virtual BOOL postBuild(); | 361 | virtual BOOL postBuild(); |
364 | /*virtual*/ void open(); | 362 | /*virtual*/ void open(); /* Flawfinder: ignore */ |
365 | /*virtual*/ void onClose(bool app_quitting); | 363 | /*virtual*/ void onClose(bool app_quitting); |
366 | /*virtual*/ void draw(); | 364 | /*virtual*/ void draw(); |
367 | /*virtual*/ void setVisible(BOOL visible); | 365 | /*virtual*/ void setVisible(BOOL visible); |
@@ -393,6 +391,8 @@ public: | |||
393 | void setTabContainer(LLTabContainerCommon* tab_container) { if (!mTabContainer) mTabContainer = tab_container; } | 391 | void setTabContainer(LLTabContainerCommon* tab_container) { if (!mTabContainer) mTabContainer = tab_container; } |
394 | static void onTabSelected(void* userdata, bool); | 392 | static void onTabSelected(void* userdata, bool); |
395 | 393 | ||
394 | virtual void resizeToContents(); | ||
395 | |||
396 | protected: | 396 | protected: |
397 | struct LLFloaterData | 397 | struct LLFloaterData |
398 | { | 398 | { |