livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge viewer-cougar

master
Ansariel 2019-03-02 01:49:39 +01:00
parent fff9fdf9ba e58a45ec46
commit b0e32c3986
15 changed files with 2 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -222,6 +222,7 @@ Ansariel Hiller
MAINT-6917
MAINT-8085
MAINT-8723
SL-10385
Aralara Rajal
Arare Chantilly
CHUIBUG-191

2
indra/newview/app_settings/settings.xml
View File

@ -16181,7 +16181,7 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>LastSystemUIScaleFactor</key>
<map>
<key>Comment</key>
<string>Size of system UI during last run. On Windows 100% (96 DPI) system setting is 1.0 UI size</string>
<string>OBSOLETE: System UI scale factor is now automatically and independently from UIScaleFactor applied</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>

6
indra/newview/llstartup.cpp
View File

@ -1234,12 +1234,6 @@ bool idle_startup()
}
}
display_startup();
// <FS:Ansariel> Fix display scaling
//if (gViewerWindow->getSystemUIScaleFactorChanged())
//{
// LLViewerWindow::showSystemUIScaleFactorChanged();
//}
// </FS:Ansariel>
LLStartUp::setStartupState( STATE_LOGIN_WAIT ); // Wait for user input
}
else

56
indra/newview/llviewerwindow.cpp
View File

@ -1679,8 +1679,6 @@ BOOL LLViewerWindow::handleDPIChanged(LLWindow *window, F32 ui_scale_factor, S32
{
if (ui_scale_factor >= MIN_UI_SCALE && ui_scale_factor <= MAX_UI_SCALE)
{
// <FS:Ansariel> Fix display scaling
//gSavedSettings.setF32("LastSystemUIScaleFactor", ui_scale_factor);
LLViewerWindow::reshape(window_width, window_height);
mResDirty = true;
return TRUE;
@ -1763,7 +1761,6 @@ LLViewerWindow::LLViewerWindow(const Params& p)
mStatesDirty(false),
mCurrResolutionIndex(0),
mProgressView(NULL),
//mSystemUIScaleFactorChanged(false), // <FS:Ansariel> Fix display scaling
mProgressViewMini(NULL)
{
// gKeyboard is still NULL, so it doesn't do LLWindowListener any good to
@ -1844,34 +1841,6 @@ LLViewerWindow::LLViewerWindow(const Params& p)
LLCoordScreen scr;
mWindow->getSize(&scr);
// <FS:Ansariel> Settings don't exist anymore as of 28-11-2017
// if(p.fullscreen && ( scr.mX!=p.width || scr.mY!=p.height))
// {
//LL_WARNS() << "Fullscreen has forced us in to a different resolution now using "<<scr.mX<<" x "<<scr.mY<<LL_ENDL;
//gSavedSettings.setS32("FullScreenWidth",scr.mX);
//gSavedSettings.setS32("FullScreenHeight",scr.mY);
// }
// </FS:Ansariel>
#if LL_DARWIN
F32 system_scale_factor = 1.f;
#else
F32 system_scale_factor = mWindow->getSystemUISize();
if (system_scale_factor < MIN_UI_SCALE || system_scale_factor > MAX_UI_SCALE)
{
// reset to default;
system_scale_factor = 1.f;
}
#endif
// <FS:Ansariel> Fix display scaling
//if (p.first_run || gSavedSettings.getF32("LastSystemUIScaleFactor") != system_scale_factor)
//{
// mSystemUIScaleFactorChanged = !p.first_run;
// gSavedSettings.setF32("LastSystemUIScaleFactor", system_scale_factor);
// gSavedSettings.setF32("UIScaleFactor", system_scale_factor);
//}
// </FS:Ansariel>
// Get the real window rect the window was created with (since there are various OS-dependent reasons why
// the size of a window or fullscreen context may have been adjusted slightly...)
F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor"), MIN_UI_SCALE, MAX_UI_SCALE) * mWindow->getSystemUISize();
@ -2009,36 +1978,11 @@ LLViewerWindow::LLViewerWindow(const Params& p)
mWorldViewRectScaled = calcScaledRect(mWorldViewRectRaw, mDisplayScale);
}
//static
// <FS:Ansariel> Fix display scaling
//void LLViewerWindow::showSystemUIScaleFactorChanged()
//{
// LLNotificationsUtil::add("SystemUIScaleFactorChanged", LLSD(), LLSD(), onSystemUIScaleFactorChanged);
//}
// </FS:Ansariel>
std::string LLViewerWindow::getLastSnapshotDir()
{
return sSnapshotDir;
}
//static
// <FS:Ansariel> Fix display scaling
//bool LLViewerWindow::onSystemUIScaleFactorChanged(const LLSD& notification, const LLSD& response)
//{
// S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
// if(option == 0)
// {
// LLFloaterReg::toggleInstanceOrBringToFront("preferences");
// LLFloater* pref_floater = LLFloaterReg::getInstance("preferences");
// LLTabContainer* tab_container = pref_floater->getChild<LLTabContainer>("pref core");
// tab_container->selectTabByName("advanced1");
//
// }
// return false;
//}
// </FS:Ansariel>
void LLViewerWindow::initGLDefaults()
{
gGL.setSceneBlendType(LLRender::BT_ALPHA);

8
indra/newview/llviewerwindow.h
View File

@ -428,10 +428,6 @@ public:
void setTitle(const std::string& win_title);
// </FS:TT>
// <FS:Ansariel> Fix display scaling
//bool getSystemUIScaleFactorChanged() { return mSystemUIScaleFactorChanged; }
//static void showSystemUIScaleFactorChanged();
// </FS:Ansariel>
static std::string getLastSnapshotDir();
private:
@ -447,8 +443,6 @@ private:
S32 getChatConsoleBottomPad(); // Vertical padding for child console rect, varied by bottom clutter
LLRect getChatConsoleRect(); // Get optimal cosole rect.
// <FS:Ansariel> Fix display scaling
//static bool onSystemUIScaleFactorChanged(const LLSD& notification, const LLSD& response);
private:
LLWindow* mWindow; // graphical window object
bool mActive;
@ -523,8 +517,6 @@ private:
LLPointer<LLViewerObject> mDragHoveredObject;
static LLTrace::SampleStatHandle<> sMouseVelocityStat;
// <FS:Ansariel> Fix display scaling
//bool mSystemUIScaleFactorChanged; // system UI scale factor changed from last run
};
//

4
indra/newview/skins/default/xui/de/notifications.xml
View File

@ -1627,10 +1627,6 @@ Geben Sie das Objekt zum Verkauf frei und versuchen Sie es erneut.
Möchten Sie Ihren Internetbrowser öffnen, um diesen Inhalt anzuzeigen?
<usetemplate ignoretext="Meinen Browser starten, um eine Webseite anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="SystemUIScaleFactorChanged">
Der UI-Größenfaktor des Systems hat sich seit der letzten Ausführung geändert. Möchten Sie die Seite mit den UI-Größeneinstellungen öffnen?
<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
</notification>
<notification name="WebLaunchJoinNow">
Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihr Konto zu verwalten?
<usetemplate ignoretext="Meinen Browser starten, um mein Konto zu verwalten" name="okcancelignore" notext="Abbrechen" yestext="OK"/>

12
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -4046,18 +4046,6 @@ Opening webpages from an unknown source may place your computer at risk.
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="SystemUIScaleFactorChanged"
type="alertmodal">
System UI size factor has changed since last run. Do you want to open UI size adjustment settings page?
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="WebLaunchJoinNow"

4
indra/newview/skins/default/xui/es/notifications.xml
View File

@ -1604,10 +1604,6 @@ Por favor, pon en venta el objeto y vuelve a intentarlo.
¿Quieres abrir tu navegador para ver este contenido?
<usetemplate ignoretext="Abrir mi navegador para ver una página web" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
</notification>
<notification name="SystemUIScaleFactorChanged">
El factor de tamaño de IU del sistema ha cambiado desde la última ejecución. ¿Deseas abrir la página de ajustes de tamaño de la IU?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Aceptar"/>
</notification>
<notification name="WebLaunchJoinNow">
¿Ir al [http://secondlife.com/account/ Panel de Control] para administrar tu cuenta?
<usetemplate ignoretext="Abrir mi navegador para administrar mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>

4
indra/newview/skins/default/xui/fr/notifications.xml
View File

@ -1559,10 +1559,6 @@ Veuillez choisir un objet à vendre et réessayer.
Voulez-vous ouvrir votre navigateur web système pour afficher ce contenu ?
<usetemplate ignoretext="Ouvrir mon navigateur pour consulter une page web" name="okcancelignore" notext="Annuler" yestext="OK"/>
</notification>
<notification name="SystemUIScaleFactorChanged">
Le facteur de taille de l’interface système a changé depuis la dernière exécution. Voulez-vous ouvrir la page des paramètres d’ajustement de la taille de l’interface ?
<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
</notification>
<notification name="WebLaunchJoinNow">
Accéder à votre [http://secondlife.com/account/ Page d&apos;accueil] pour gérer votre compte ?
<usetemplate ignoretext="Lancer mon navigateur pour gérer mon compte" name="okcancelignore" notext="Annuler" yestext="OK"/>

4
indra/newview/skins/default/xui/it/notifications.xml
View File

@ -1533,10 +1533,6 @@ Se il messaggio si ripresenta, controllare su [SUPPORT_SITE].
L&apos;apertura di pagine da una sorgente sconosciuta può mettere a rischio il computer.
<usetemplate ignoretext="Lancia il browser per consultare una pagina web" name="okcancelignore" notext="Annulla" />
</notification>
<notification name="SystemUIScaleFactorChanged">
Il fattore di scala dell&apos; interfaccia è stato modificato. Aprire la pagina delle impostazioni?
<usetemplate name="okcancelbuttons" notext="Annulla" />
</notification>
<notification name="WebLaunchJoinNow">
Vuoi andare su [http://secondlife.com/account/ Dashboard] per gestire il tuo account?
<usetemplate ignoretext="Lancia il browser per gestire il mio account" name="okcancelignore" notext="Annulla" />

4
indra/newview/skins/default/xui/ja/notifications.xml
View File

@ -1687,10 +1687,6 @@ SHA1 フィンガープリント： [MD5_DIGEST]
Web ブラウザを開いてこのコンテンツを表示しますか？
<usetemplate ignoretext="ブラウザを起動して Web ページを見るとき" name="okcancelignore" notext="キャンセル" yestext="OK"/>
</notification>
<notification name="SystemUIScaleFactorChanged">
前回実行時からシステム UI サイズ係数が変更されています。UI サイズ調整設定ページを開きますか?
<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
</notification>
<notification name="WebLaunchJoinNow">
[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウントを管理しますか？
<usetemplate ignoretext="ブラウザを起動してアカウントを管理するとき" name="okcancelignore" notext="取り消し" yestext="OK"/>

4
indra/newview/skins/default/xui/pt/notifications.xml
View File

@ -1539,10 +1539,6 @@ Por favor, ponha o objeto à venda e tente novamente.
Abrir uma janela do navegador para ver essas informações?
<usetemplate ignoretext="Abrir o navegador para acessar uma página na web" name="okcancelignore" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="SystemUIScaleFactorChanged">
O fator de tamanho da interface do sistema foi alterado desde a última execução. Deseja abrir a página de configurações de ajuste de tamanho da interface?
<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
</notification>
<notification name="WebLaunchJoinNow">
Deseja abrir o [http://secondlife.com/account/ Painel] para gerenciar sua conta?
<usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="OK"/>

4
indra/newview/skins/default/xui/ru/notifications.xml
View File

@ -1597,10 +1597,6 @@
Открытие сайтов от неизвестных источников может нанести вред вашему компьютеру
<usetemplate ignoretext="Запустить браузер для просмотра веб-страницы" name="okcancelignore" notext="Отмена" yestext="OK"/>
</notification>
<notification name="SystemUIScaleFactorChanged">
Со времени последнего запуска изменился системный коэффициент размера интерфейса. Открыть страницу настроек размера интерфейса?
<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
</notification>
<notification name="WebLaunchJoinNow">
Перейти на [http://secondlife.com/account/ личный кабинет] для управления вашим аккаунтом?
<usetemplate ignoretext="Запустить браузер для управления аккаунтом" name="okcancelignore" notext="Отмена" yestext="OK"/>

4
indra/newview/skins/default/xui/tr/notifications.xml
View File

@ -1601,10 +1601,6 @@ Nesneyi satılık olarak ayarlayıp tekrar deneyin.
Bu içeriği görüntülemek için Web tarayıcınızı açmak istiyor musunuz?
<usetemplate ignoretext="Bir web sayfasını görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Tamam"/>
</notification>
<notification name="SystemUIScaleFactorChanged">
Sistem kullanıcı arayüzü faktörü son çalıştırmadan bu yana değişti. Kullanıcı arayüzü büyüklük değiştirme ayarları sayfasını açmak istiyor musunuz?
<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
</notification>
<notification name="WebLaunchJoinNow">
Hesabınızı yönetmek için [http://secondlife.com/account/ Kontrol Paneli] adresine gidilsin mi?
<usetemplate ignoretext="Hesabımı yönetmek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Tamam"/>

4
indra/newview/skins/default/xui/zh/notifications.xml
View File

@ -1542,10 +1542,6 @@ SHA1 指紋：[MD5_DIGEST]
你確定要開啟網頁瀏覽器去察看這個內容？
<usetemplate ignoretext="啟動我的網頁瀏覽器去察看網頁" name="okcancelignore" notext="取消" yestext="確定"/>
</notification>
<notification name="SystemUIScaleFactorChanged">
系統使用者介面的尺寸倍數自從上次執行後已經改變。 你想要開啟使用者介面尺寸調整的設定頁嗎？
<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
</notification>
<notification name="WebLaunchJoinNow">
前往你的[http://secondlife.com/account/ 塗鴉牆]以進行管理你的帳戶？
<usetemplate ignoretext="啟動我的瀏覽器以管理我的帳戶" name="okcancelignore" notext="取消" yestext="確定"/>