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

fix linux x64 build / mono-d build

This commit is contained in:
Vadim Lopatin 2014-04-21 15:14:07 +04:00
parent 178d6fd00b
commit 19f138ea07
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlanguilib.dproj
View File

@ -182,6 +182,7 @@
<Compile Include="src\dlangui\widgets\popup.d" /> <Compile Include="src\dlangui\widgets\popup.d" />
<Compile Include="src\dlangui\core\collections.d" /> <Compile Include="src\dlangui\core\collections.d" />
<Compile Include="src\dlangui\core\signals.d" /> <Compile Include="src\dlangui\core\signals.d" />
<Compile Include="src\dlangui\widgets\editors.d" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="src\dlangui\platforms\x11\" /> <Folder Include="src\dlangui\platforms\x11\" />

5
src/dlangui/widgets/controls.d
View File

@ -575,6 +575,11 @@ class ScrollBar : AbstractSlider, OnClickHandler {
addChild(_indicator); addChild(_indicator);
addChild(_pageUp); addChild(_pageUp);
addChild(_pageDown); addChild(_pageDown);
_btnBack.focusable = false;
_btnForward.focusable = false;
_indicator.focusable = false;
_pageUp.focusable = false;
_pageDown.focusable = false;
_btnBack.onClickListener = &onClick; _btnBack.onClickListener = &onClick;
_btnForward.onClickListener = &onClick; _btnForward.onClickListener = &onClick;
_pageUp.onClickListener = &onClick; _pageUp.onClickListener = &onClick;

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

@ -153,7 +153,7 @@ class EditableContent {
int m = 0; int m = 0;
foreach(s; _lines) foreach(s; _lines)
if (m < s.length) if (m < s.length)
m = s.length; m = cast(int)s.length;
return m; return m;
} }
@ -376,7 +376,7 @@ class EditLine : EditWidgetBase {
return res; return res;
} }
} }
res.pos = _measuredText.length; res.pos = cast(int)_measuredText.length;
return res; return res;
} }
@ -448,7 +448,7 @@ class EditLine : EditWidgetBase {
case EditorActions.DocumentEnd: case EditorActions.DocumentEnd:
case EditorActions.LineEnd: case EditorActions.LineEnd:
if (_caretPos.pos < _measuredText.length) { if (_caretPos.pos < _measuredText.length) {
_caretPos.pos = _measuredText.length; _caretPos.pos = cast(int)_measuredText.length;
invalidate(); invalidate();
} }
return true; return true;
@ -712,10 +712,10 @@ class EditBox : EditWidgetBase, OnScrollHandler {
return res; return res;
} }
} }
res.pos = _visibleLines[lineIndex].length; res.pos = cast(int)_visibleLines[lineIndex].length;
} else { } else {
res.line = _firstVisibleLine + _visibleLines.length - 1; res.line = _firstVisibleLine + cast(int)_visibleLines.length - 1;
res.pos = _visibleLines[$ - 1].length; res.pos = cast(int)_visibleLines[$ - 1].length;
} }
return res; return res;
} }
@ -727,7 +727,7 @@ class EditBox : EditWidgetBase, OnScrollHandler {
_caretPos.line = 0; _caretPos.line = 0;
dstring currentLine = _content[_caretPos.line]; dstring currentLine = _content[_caretPos.line];
if (_caretPos.pos > currentLine.length) if (_caretPos.pos > currentLine.length)
_caretPos.pos = currentLine.length; _caretPos.pos = cast(int)currentLine.length;
if (_caretPos.pos < 0) if (_caretPos.pos < 0)
_caretPos.pos = 0; _caretPos.pos = 0;
} }
@ -811,14 +811,14 @@ class EditBox : EditWidgetBase, OnScrollHandler {
case EditorActions.DocumentEnd: case EditorActions.DocumentEnd:
if (_caretPos.line < _content.length - 1 || _caretPos.pos < _content[_content.length - 1].length) { if (_caretPos.line < _content.length - 1 || _caretPos.pos < _content[_content.length - 1].length) {
_caretPos.line = _content.length - 1; _caretPos.line = _content.length - 1;
_caretPos.pos = _content[_content.length - 1].length; _caretPos.pos = cast(int)_content[_content.length - 1].length;
ensureCaretVisible(); ensureCaretVisible();
invalidate(); invalidate();
} }
return true; return true;
case EditorActions.LineEnd: case EditorActions.LineEnd:
if (_caretPos.pos < currentLine.length) { if (_caretPos.pos < currentLine.length) {
_caretPos.pos = currentLine.length; _caretPos.pos = cast(int)currentLine.length;
ensureCaretVisible(); ensureCaretVisible();
invalidate(); invalidate();
} }