forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
Vadim Lopatin 2014-09-08 13:41:28 +04:00
parent 0a47398344
commit 54c67d9a0b
13 changed files with 935 additions and 926 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlanguilib.dproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.0</ProductVersion>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{440816C8-DBD6-454C-A0D7-B6E59CA1ED86}</ProjectGuid>
<UseDefaultCompiler>true</UseDefaultCompiler>
@ -12,11 +12,11 @@
<Compiler>DMD2</Compiler>
<Includes>
<Includes>
<Path>/home/lve/src/d/DerelictFT/source</Path>
<Path>/home/lve/src/d/DerelictGL3/source</Path>
<Path>/home/lve/src/d/DerelictUtil/source</Path>
<Path>/home/lve/src/d/dlangui/3rdparty/X11</Path>
<Path>/home/lve/src/d/dlangui/3rdparty/X11/xcb</Path>
<Path>\home\lve\src\d\DerelictFT\source</Path>
<Path>\home\lve\src\d\DerelictGL3\source</Path>
<Path>\home\lve\src\d\DerelictUtil\source</Path>
<Path>\home\lve\src\d\dlangui\3rdparty\X11</Path>
<Path>\home\lve\src\d\dlangui\3rdparty\X11\xcb</Path>
</Includes>
</Includes>
</PropertyGroup>
@ -217,6 +217,7 @@
<Compile Include="..\DerelictSDL2\source\derelict\sdl2\types.d">
<Link>3rdparty\FreetypeSDL2\types.d</Link>
</Compile>
<Compile Include="src\dlangui\widgets\grid.d" />
</ItemGroup>
<ItemGroup>
<Folder Include="src\dlangui\platforms\x11\" />

2
dlanguilib.visualdproj
View File

@ -89,6 +89,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>2</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />
@ -183,6 +184,7 @@
<resfile />
<exefile>$(OutDir)\$(ProjectName).lib</exefile>
<useStdLibPath>1</useStdLibPath>
<cRuntime>1</cRuntime>
<additionalOptions />
<preBuildCommand />
<postBuildCommand />

2
src/dlangui/core/i18n.d
View File

@ -167,7 +167,7 @@ private shared class UIStringList {
private dstring[string] _map;
/// remove all items
void clear() {
_map.clear();
_map.destroy();
}
/// set item value
void set(string id, dstring value) {

7
src/dlangui/graphics/fonts.d
View File

@ -151,8 +151,13 @@ class Font : RefCountedObject {
/// returns true if font is fixed
@property int spaceWidth() {
if (_spaceWidth < 0)
if (_spaceWidth < 0) {
_spaceWidth = charWidth(' ');
if (_spaceWidth <= 0)
_spaceWidth = charWidth('0');
if (_spaceWidth <= 0)
_spaceWidth = size;
}
return _spaceWidth;
}

6
src/dlangui/graphics/ftfonts.d
View File

@ -126,8 +126,8 @@ private class FreeTypeFontFile {
private static string familyName(FT_Face face)
{
string faceName = cast(string)fromStringz(face.family_name);
string styleName = cast(string)fromStringz(face.style_name);
string faceName = fromStringz(face.family_name).dup;
string styleName = fromStringz(face.style_name).dup;
if (faceName.equal("Arial") && styleName.equal("Narrow"))
faceName ~= " Narrow";
else if (styleName.equal("Condensed"))
@ -147,7 +147,7 @@ private class FreeTypeFontFile {
} else if (exists(kernFile ~ ".pfm" )) {
kernFile ~= ".pfm";
} else {
kernFile.clear();
kernFile.destroy();
}
if (kernFile.length > 0)
error = FT_Attach_File(_face, kernFile.toStringz);

12
src/dlangui/graphics/resources.d
View File

@ -654,7 +654,7 @@ class ImageCache {
destroy(item);
item = null;
}
_map.clear();
_map.destroy();
}
}
@ -705,7 +705,7 @@ class DrawableCache {
_drawable.clear();
foreach(ref t; _transformed)
t.clear();
_transformed.clear();
_transformed.destroy();
debug(resalloc) Log.d("Destroyed DrawableCacheItem, count=", --_instanceCount);
}
/// remove from memory, will cause reload on next access
@ -714,7 +714,7 @@ class DrawableCache {
_drawable.clear();
foreach(t; _transformed)
t.clear();
_transformed.clear();
_transformed.destroy();
}
/// mark as not used
void checkpoint() {
@ -800,10 +800,10 @@ class DrawableCache {
}
void clear() {
Log.d("DrawableCache.clear()");
_idToFileMap.clear();
_idToFileMap.destroy();
foreach(DrawableCacheItem item; _idToDrawableMap)
item.drawable.clear();
_idToDrawableMap.clear();
_idToDrawableMap.destroy();
}
// clear usage flags for all entries
void checkpoint() {
@ -925,7 +925,7 @@ class DrawableCache {
destroy(item);
item = null;
}
_idToDrawableMap.clear();
_idToDrawableMap.destroy();
debug(resalloc) Log.e("Drawable instace count after destroying of DrawableCache: ", ImageDrawable.instanceCount);
}
}

6
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -598,7 +598,7 @@ version(USE_SDL) {
}
bool processTextInput(const char * s) {
string str = cast(string)fromStringz(s);
string str = fromStringz(s).dup;
dstring ds = toUTF32(str);
uint flags = convertKeyFlags(SDL_GetModState());
bool res = dispatchKeyEvent(new KeyEvent(KeyAction.Text, 0, flags, ds));
@ -910,7 +910,7 @@ version(USE_SDL) {
char * txt = SDL_GetClipboardText();
if (!txt)
return ""d;
string s = cast(string)fromStringz(txt);
string s = fromStringz(txt).dup;
SDL_free(txt);
return toUTF32(s);
}
@ -988,7 +988,7 @@ version(USE_SDL) {
Log.d("myWinMain()");
string basePath = exePath();
Log.i("Current executable: ", exePath());
string cmdline = cast(string)fromStringz(lpCmdLine);
string cmdline = fromStringz(lpCmdLine).dup;
Log.i("Command line: ", cmdline);
string[] args = splitCmdLine(cmdline);
Log.i("Command line params: ", args);

5
src/dlangui/platforms/windows/win32fonts.d
View File

@ -119,7 +119,7 @@ class Win32Font : Font {
0,
null,
&identity );
if (res==GDI_ERROR)
if (res == GDI_ERROR)
return null;
int gs = GetGlyphOutlineW( _drawbuf.dc, cast(wchar)ch,
GGO_GRAY8_BITMAP, //GGO_METRICS
@ -287,6 +287,7 @@ class Win32FontManager : FontManager {
override ref FontRef getFont(int size, int weight, bool italic, FontFamily family, string face) {
//Log.i("getFont()");
FontDef * def = findFace(family, face);
Log.i("getFont() found face ", def.face, " by requested face ", face);
if (def !is null) {
int index = _activeFonts.find(size, weight, italic, def.family, def.face);
if (index >= 0)
@ -415,7 +416,7 @@ extern(Windows) {
{
void * p = cast(void*)lParam;
Win32FontManager fontman = cast(Win32FontManager)p;
string face = cast(string)fromStringz(lf.lfFaceName.ptr);
string face = fromStringz(lf.lfFaceName.ptr).dup;
FontFamily family = pitchAndFamilyToFontFamily(lf.lfPitchAndFamily);
if (face.length < 2 || face[0] == '@')
return 1;

4
src/dlangui/platforms/windows/winapp.d
View File

@ -719,7 +719,7 @@ private __gshared Win32Platform w32platform;
int myWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int iCmdShow)
{
setFileLogger(std.stdio.File("ui.log", "w"));
Log.setFileLogger(std.stdio.File("ui.log", "w"));
debug {
Log.setLogLevel(LogLevel.Trace);
} else {
@ -728,7 +728,7 @@ int myWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int
Log.d("myWinMain()");
string basePath = exePath();
Log.i("Current executable: ", exePath());
string cmdline = fromStringz(lpCmdLine);
string cmdline = fromStringz(lpCmdLine).dup;
Log.i("Command line: ", cmdline);
string[] args = splitCmdLine(cmdline);
Log.i("Command line params: ", args);

2
src/dlangui/widgets/lists.d
View File

@ -406,7 +406,7 @@ class ListWidget : WidgetGroup, OnScrollHandler {
int sbsize = _orientation == Orientation.Vertical ? _scrollbar.measuredWidth : _scrollbar.measuredHeight;
// measure children
Point sz;
_sbsz.clear;
_sbsz.destroy();
for (int i = 0; i < itemCount; i++) {
Widget w = itemWidget(i);
if (w is null || w.visibility == Visibility.Gone) {

6
src/dlangui/widgets/styles.d
View File

@ -558,12 +558,12 @@ class Style {
destroy(item);
item = null;
}
_substates.clear();
_substates.destroy();
foreach(ref Style item; _children) {
destroy(item);
item = null;
}
_children.clear();
_children.destroy();
_backgroundDrawable.clear();
_font.clear();
debug(resalloc) _instanceCount--;
@ -638,7 +638,7 @@ class Theme : Style {
destroy(item);
item = null;
}
_byId.clear();
_byId.destroy();
}
/// create wrapper style which will have currentTheme.get(id) as parent instead of fixed parent - to modify some base style properties in widget