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

Merge pull request #603 from Maeriden/maeriden 

Fix for call to to!string and deprecation warnings
This commit is contained in:
Vadim Lopatin 2020-07-28 12:10:13 +03:00 committed by GitHub
parent 1022a8384d bbfb1ce96f
commit 84324e417e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dlangui/core/settings.d
View File

@ -498,7 +498,7 @@ final class Setting {
case UINTEGER: case UINTEGER:
return to!string(_store.uinteger); return to!string(_store.uinteger);
case FLOAT: case FLOAT:
return to!string(_store.floating); return to!string(cast(double)_store.floating);
case TRUE: case TRUE:
return "true"; return "true";
case FALSE: case FALSE:
@ -519,7 +519,7 @@ final class Setting {
case UINTEGER: case UINTEGER:
return to!string(_store.uinteger); return to!string(_store.uinteger);
case FLOAT: case FLOAT:
return to!string(_store.floating); return to!string(cast(double)_store.floating);
case TRUE: case TRUE:
return "true"; return "true";
case FALSE: case FALSE:

2
src/dlangui/dialogs/filedlg.d
View File

@ -374,7 +374,7 @@ class FileDialog : Dialog, CustomGridCellAdapter {
return "----.--.-- --:--"; return "----.--.-- --:--";
} else { } else {
//date = "%04d.%02d.%02d %02d:%02d:%02d".format(ts.year, ts.month, ts.day, ts.hour, ts.minute, ts.second); //date = "%04d.%02d.%02d %02d:%02d:%02d".format(ts.year, ts.month, ts.day, ts.hour, ts.minute, ts.second);
return "%04d.%02d.%02d %02d:%02d".format(ts.year, ts.month, ts.day, ts.hour, ts.minute); return "%04d.%02d.%02d %02d:%02d".format(ts.get.year, ts.get.month, ts.get.day, ts.get.hour, ts.get.minute);
} }
} }

2
src/dlangui/dom/cssparser.d
View File

@ -81,7 +81,6 @@ struct CSSToken {
string text; string text;
string dimensionUnit; string dimensionUnit;
union { union {
bool typeFlagId; // true if identifier is valid ID
struct { struct {
long intValue = 0; // for number and dimension long intValue = 0; // for number and dimension
double doubleValue = 0; // for number and dimension double doubleValue = 0; // for number and dimension
@ -91,6 +90,7 @@ struct CSSToken {
uint unicodeRangeStart; // for unicodeRange (initialized to 0 via intValue=0) uint unicodeRangeStart; // for unicodeRange (initialized to 0 via intValue=0)
uint unicodeRangeEnd; // for unicodeRange (initialized to 0 via intValue=0) uint unicodeRangeEnd; // for unicodeRange (initialized to 0 via intValue=0)
} }
bool typeFlagId; // true if identifier is valid ID
} }
} }

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

@ -538,7 +538,7 @@ class FreeTypeFontManager : FontManager {
FontFileItem best = null; FontFileItem best = null;
int bestScore = 0; int bestScore = 0;
string[] faces = face ? split(face, ",") : null; string[] faces = face ? split(face, ",") : null;
foreach(int index, FontFileItem item; _fontFiles) { foreach(size_t index, FontFileItem item; _fontFiles) {
int score = 0; int score = 0;
int bestFaceMatch = 0; int bestFaceMatch = 0;
if (faces && face.length) { if (faces && face.length) {

2
src/dlangui/graphics/scene/scene3d.d
View File

@ -120,7 +120,7 @@ bool visit(Node3d node, bool delegate(Node3d node) visitor) {
if (res) if (res)
return true; return true;
foreach(child; node.children) { foreach(child; node.children) {
bool res = visit(child, visitor); res = visit(child, visitor);
if (res) if (res)
return true; return true;
} }

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

@ -3556,8 +3556,9 @@ class EditBox : EditWidgetBase {
rc.offset(0, yOffset); rc.offset(0, yOffset);
Rect[] wrappedSelection; Rect[] wrappedSelection;
wrappedSelection.length = curSpan.len; wrappedSelection.length = curSpan.len;
foreach (int i, wrapLineRect; wrappedSelection) foreach (size_t i_, wrapLineRect; wrappedSelection)
{ {
int i = cast(int)i_;
int startingDifference = rc.left - _clientRect.left; int startingDifference = rc.left - _clientRect.left;
wrapLineRect = rc; wrapLineRect = rc;
wrapLineRect.offset(-1 * curSpan.accumulation(i, LineSpan.WrapPointInfo.Width), i * _lineHeight); wrapLineRect.offset(-1 * curSpan.accumulation(i, LineSpan.WrapPointInfo.Width), i * _lineHeight);
@ -3906,8 +3907,9 @@ class EditBox : EditWidgetBase {
wrappedLine = _span[i].wrappedContent; wrappedLine = _span[i].wrappedContent;
int accumulativeLength; int accumulativeLength;
CustomCharProps[] wrapProps; CustomCharProps[] wrapProps;
foreach (int q, curWrap; wrappedLine) foreach (size_t q_, curWrap; wrappedLine)
{ {
int q = cast(int)q_;
auto lineOffset = q + i + wrapsUpTo(i + _firstVisibleLine); auto lineOffset = q + i + wrapsUpTo(i + _firstVisibleLine);
if (highlight) if (highlight)
{ {