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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

meow-7.2.2
Ansariel 2022-10-19 10:29:34 +02:00
parent b80fefa0ab 1a17c8df44
commit 869781cf74
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
autobuild.xml
View File

@ -22,16 +22,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>db1a758da143fe0177df2b472eaa8d78</string>
<string>ba107bef7cdb9c8548d62e749d9af6fd</string>
<key>url</key>
<string>http://3p.firestormviewer.org/SDL2-2.0.20-linux64-222610218.tar.bz2</string>
<string>http://3p.firestormviewer.org/SDL2-2.24.1-linux64-222872152.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
</map>
<key>version</key>
<string>2.0.20</string>
<string>2.24.1</string>
</map>
<key>gstreamer10</key>
<map>
@ -1098,11 +1098,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>3f2074002402c2998a20c77f67018f26</string>
<string>a45bb657d668b7f1b4fa4c88eb81a80a</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///opt/firestorm/fmodstudio-2.02.08-linux64-222661443.tar.bz2</string>
<string>file:///opt/firestorm/fmodstudio-2.02.09-linux64-222891103.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -1112,11 +1112,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>ed811d36be10adf2bb63727912ce80a5</string>
<string>6dd278518e791dbc2841e337feb295db</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.08-windows-222661019.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.09-windows-222890940.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1126,18 +1126,18 @@
<key>archive</key>
<map>
<key>hash</key>
<string>924cde33101376ffd995316a5264d361</string>
<string>1b7ced6f750b12f0d014556705019534</string>
<key>hash_algorithm</key>
<string>md5</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.08-windows64-222661021.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/fmodstudio-2.02.09-windows64-222890941.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>2.02.08</string>
<string>2.02.09</string>
</map>
<key>fontconfig</key>
<map>
@ -2642,16 +2642,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>411c000af6328e454ff7064f90c18a81</string>
<string>8ad6779b81899afb7bd803ac2e2af37a</string>
<key>url</key>
<string>http://3p.firestormviewer.org/open_libndofdev-0.13.222610246-linux64-222610246.tar.bz2</string>
<string>http://3p.firestormviewer.org/open_libndofdev-0.13.222872202-linux64-222872202.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
</map>
<key>version</key>
<string>0.13.222441031</string>
<string>0.13.222872202</string>
</map>
<key>openal</key>
<map>

10
indra/llwindow/llwindowsdl2.cpp
View File

@ -41,6 +41,10 @@
#include "llfindlocale.h"
#include "llframetimer.h"
// if there is a better methood to get at the settings from llwindow/ let me know! -Zi
#include "llcontrol.h"
extern LLControlGroup gSavedSettings;
#ifdef LL_GLIB
#include <glib.h>
#endif
@ -675,6 +679,8 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
// IME - International input compositing, i.e. for Japanese / Chinese text input
// Request the IME interface to show over-the-top compositing while typing
mIMEEnabled = gSavedSettings.getBOOL("SDL2IMEEnabled");
if (mIMEEnabled)
{
SDL_SetHint( SDL_HINT_IME_INTERNAL_EDITING, "1");
@ -2691,6 +2697,10 @@ void* LLWindowSDL::createSharedContext()
LLCoordScreen size;
if (getSize(&size))
{
// tickle window size to fix font going blocky on login screen since SDL 2.24.0
size.mX--;
setSize(size);
size.mX++;
setSize(size);
}