FIRE-6399: Brute-force method to make outfits list search filter useful and not locking up the entire viewer by not auto-filtering after each keypress

2020-10-24 17:35:09 +02:00 · 2020-10-24 17:35:09 +02:00 · 575252a198
parent 4579730714
commit 575252a198
17 changed files with 31 additions and 21 deletions
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@ -104,7 +104,10 @@ BOOL LLSidepanelAppearance::postBuild()

 	childSetAction("edit_outfit_btn", boost::bind(&LLSidepanelAppearance::showOutfitEditPanel, this));

-	mFilterEditor = getChild<LLFilterEditor>("Filter");
+	// <FS:Ansariel> Don't filter outfits list on keypress
+	//mFilterEditor = getChild<LLFilterEditor>("Filter");
+	mFilterEditor = findChild<LLSearchEditor>("Filter");
+	// </FS:Ansariel>
 	if (mFilterEditor)
 	{
 		mFilterEditor->setCommitCallback(boost::bind(&LLSidepanelAppearance::onFilterEdit, this, _2));
--- a/indra/newview/llsidepanelappearance.h
+++ b/indra/newview/llsidepanelappearance.h
@ -33,7 +33,10 @@
 #include "llinventory.h"
 #include "llpaneloutfitedit.h"

-class LLFilterEditor;
+// <FS:Ansariel> Don't filter outfits list on keypress
+//class LLFilterEditor;
+class LLSearchEditor;
+// </FS:Ansariel>
 class LLCurrentlyWornFetchObserver;
 class LLPanelEditWearable;
 class LLViewerWearable;
@ -91,7 +94,10 @@ private:
 	void toggleOutfitEditPanel(BOOL visible, BOOL disable_camera_switch = FALSE);
 	void toggleWearableEditPanel(BOOL visible, LLViewerWearable* wearable = NULL, BOOL disable_camera_switch = FALSE);

-	LLFilterEditor*			mFilterEditor;
+	// <FS:Ansariel> Don't filter outfits list on keypress
+	//LLFilterEditor*			mFilterEditor;
+	LLSearchEditor*				mFilterEditor;
+	// </FS:Ansariel>
 	LLPanelOutfitsInventory* mPanelOutfitsInventory;
 	LLPanelOutfitEdit*		mOutfitEdit;
 	LLPanelEditWearable*	mEditWearable;
--- a/indra/newview/skins/ansastorm/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/ansastorm/xui/en/sidepanel_appearance.xml
@ -108,7 +108,8 @@ width="415">
      top="6"
      width="24" />
   </panel>
-   <filter_editor
+   <search_editor
+   clear_button_visible="true"
   height="23"
   follows="left|top|right"
   layout="topleft"
--- a/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_appearance.xml
@ -12,5 +12,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Redigér dette sæt"/>
 	</panel>
-	<filter_editor label="Filtrér sæt" name="Filter"/>
+	<search_editor label="Filtrér sæt" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_appearance.xml
@ -15,5 +15,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Dieses Outfit bearbeiten"/>
 	</panel>
-	<filter_editor label="Outfits filtern" name="Filter"/>
+	<search_editor label="Outfits filtern" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@ -108,7 +108,8 @@ width="333">
      top="6"
      width="24" />
   </panel>
-   <filter_editor
+   <search_editor
+   clear_button_visible="true"
   height="23"
   follows="left|top|right"
   layout="topleft"
--- a/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_appearance.xml
@ -12,5 +12,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Editar este vestuario"/>
 	</panel>
-	<filter_editor label="Filtrar los vestuarios" name="Filter"/>
+	<search_editor label="Filtrar los vestuarios" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_appearance.xml
@ -11,5 +11,5 @@
 		<text name="currentlook_name">(Chargement)</text>
 		<button name="edit_outfit_btn" tool_tip="Modifier cette tenue"/>
 	</panel>
-	<filter_editor label="Filtrer les tenues" name="Filter"/>
+	<search_editor label="Filtrer les tenues" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_appearance.xml
@ -7,5 +7,5 @@
 	<panel name="panel_currentlook">
 		<button label="" name="edit_outfit_btn" tool_tip="Modifica questo abito"/>
 	</panel>
-	<filter_editor label="Filtri per gli abiti" name="Filter"/>
+	<search_editor label="Filtri per gli abiti" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_appearance.xml
@ -15,8 +15,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="このアウトフィットを編集"/>
 	</panel>
-	<filter_editor label="アウトフィットをフィルター" name="Filter"/>
-	<panel name="panel_outfits_inventory" />
-	<panel name="panel_outfit_edit" />
-	<panel name="panel_edit_wearable" />
+	<search_editor label="アウトフィットをフィルター" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pl/sidepanel_appearance.xml
@ -7,5 +7,5 @@
 	<panel name="panel_currentlook">
 		<button name="edit_outfit_btn" tool_tip="Edytuj ten strój"/>
 	</panel>
-	<filter_editor label="Filtruj stroje" name="Filter"/>
+	<search_editor label="Filtruj stroje" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_appearance.xml
@ -12,5 +12,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Editar este look"/>
 	</panel>
-	<filter_editor label="Filtrar looks" name="Filter"/>
+	<search_editor label="Filtrar looks" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_appearance.xml
@ -10,5 +10,5 @@
 		</text>
 		<button name="edit_outfit_btn" tool_tip="Редактировать комплект"/>
 	</panel>
-	<filter_editor label="Фильтр комплектов одежды" name="Filter"/>
+	<search_editor label="Фильтр комплектов одежды" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_appearance.xml
@ -15,5 +15,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="Bu dış görünümü düzenle"/>
 	</panel>
-	<filter_editor label="Dış Görünümleri Filtrele" name="Filter"/>
+	<search_editor label="Dış Görünümleri Filtrele" name="Filter"/>
 </panel>
--- a/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_appearance.xml
@ -15,5 +15,5 @@
 		</text>
 		<button label="" name="edit_outfit_btn" tool_tip="編輯這裝扮"/>
 	</panel>
-	<filter_editor label="裝扮過濾器" name="Filter"/>
+	<search_editor label="裝扮過濾器" name="Filter"/>
 </panel>
--- a/indra/newview/skins/starlight/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/starlight/xui/en/sidepanel_appearance.xml
@ -108,7 +108,8 @@ width="333">
      top="6"
      width="24" />
   </panel>
-   <filter_editor
+   <search_editor
+   clear_button_visible="true"
   height="23"
   follows="left|top|right"
   layout="topleft"
--- a/indra/newview/skins/starlightcui/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/starlightcui/xui/en/sidepanel_appearance.xml
@ -110,7 +110,8 @@ width="333">
      top="6"
      width="24" />
   </panel>
-   <filter_editor
+   <search_editor
+   clear_button_visible="true"
   height="23"
   follows="left|top|right"
   layout="topleft"