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

resizers: continue development

This commit is contained in:
Vadim Lopatin 2014-12-04 15:47:40 +03:00
parent 521e17597b
commit c13e5b097b
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
examples/example1/src/main.d
View File

@ -20,6 +20,7 @@ import dlangui.dialogs.dialog;
import dlangui.dialogs.filedlg;
import std.stdio;
import std.conv;
import std.utf;
mixin APP_ENTRY_POINT;
@ -625,7 +626,7 @@ extern (C) int UIAppMain(string[] args) {
//==========================================================================
// tree view example
TreeWidget tree = new TreeWidget("TREE1");
tree.layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
tree.layoutWidth(WRAP_CONTENT).layoutHeight(FILL_PARENT);
TreeItem tree1 = tree.items.newChild("group1", "Group 1"d, "document-open");
tree1.newChild("g1_1", "Group 1 item 1"d);
tree1.newChild("g1_2", "Group 1 item 2"d);
@ -648,8 +649,30 @@ extern (C) int UIAppMain(string[] args) {
tree3.newChild("g3_5", "Group 3 item 5"d);
tree3.newChild("g3_6", "Group 3 item 6"d);
LinearLayout treeLayout = new HorizontalLayout("TREE");
LinearLayout treeControlledPanel = new VerticalLayout();
treeLayout.layoutWidth = FILL_PARENT;
treeControlledPanel.layoutWidth = FILL_PARENT;
treeControlledPanel.layoutHeight = FILL_PARENT;
TextWidget treeItemLabel = new TextWidget("TREE_ITEM_DESC");
treeItemLabel.layoutWidth = FILL_PARENT;
treeItemLabel.layoutHeight = FILL_PARENT;
treeItemLabel.alignment = Align.Center;
treeItemLabel.text = "Sample text"d;
treeControlledPanel.addChild(treeItemLabel);
treeLayout.addChild(tree);
treeLayout.addChild(new ResizerWidget());
treeLayout.addChild(treeControlledPanel);
tree.selectionListener = delegate(TreeItems source, TreeItem selectedItem, bool activated) {
dstring label = "Selected item: "d ~ toUTF32(selectedItem.id) ~ (activated ? " selected + activated"d : " selected"d);
treeItemLabel.text = label;
};
tree.items.selectItem(tree.items.child(0));
tabs.addTab(tree, "Tree"d);
tabs.addTab(treeLayout, "Tree"d);
//==========================================================================

17
src/dlangui/widgets/layouts.d
View File

@ -38,6 +38,8 @@ struct LayoutItem {
int _maxSize; // max size for primary dimension
int _weight; // weight
bool _fillParent;
bool _isResizer;
@property bool canExtend() { return !_isResizer; }
@property int measuredSize() { return _measuredSize; }
@property int minSize() { return _measuredSize; }
@property int maxSize() { return _maxSize; }
@ -53,6 +55,8 @@ struct LayoutItem {
void set(Widget widget, Orientation orientation) {
_widget = widget;
_orientation = orientation;
if (cast(ResizerWidget)widget)
_isResizer = true;
}
/// set item and measure it
void measure(int parentWidth, int parentHeight) {
@ -144,6 +148,7 @@ class LayoutItems {
int maxItem = 0; // max item dimention
// calc total size
int visibleCount = cast(int)_list.length;
int resizersSize = 0;
for (int i = 0; i < _count; i++) {
LayoutItem * item = &_list[i];
int weight = item.weight;
@ -151,7 +156,9 @@ class LayoutItems {
totalSize += size;
if (maxItem < item.secondarySize)
maxItem = item.secondarySize;
if (item.fillParent) {
if (item._isResizer) {
resizersSize += size;
} else if (item.fillParent) {
resizableWeight += weight;
resizableSize += size * weight;
} else {
@ -179,6 +186,8 @@ class LayoutItems {
bool needResize = false;
int scaleFactor = 10000; // per weight unit
if (delta != 0 && visibleCount > 0) {
if (delta < 0)
nonresizableSize += resizersSize; // allow to shrink resizers
// need resize of some children
needResize = true;
// resize all if need to shrink or only resizable are too small to correct delta
@ -196,7 +205,7 @@ class LayoutItems {
int lastResized = -1;
for (int i = 0; i < _count; i++) {
LayoutItem * item = &_list[i];
if (item.fillParent || needForceResize) {
if ((item.fillParent || needForceResize) && (delta < 0 || item.canExtend)) {
lastResized = i;
}
}
@ -210,7 +219,7 @@ class LayoutItems {
int size = item.measuredSize;
if (needResize && (layoutSize == FILL_PARENT || needForceResize)) {
// do resize
int correction = scaleFactor * weight * size / 10000;
int correction = (delta < 0 || item.canExtend) ? scaleFactor * weight * size / 10000 : 0;
deltaTotal += correction;
// for last resized, apply additional correction to resolve calculation inaccuracy
if (i == lastResized) {
@ -274,7 +283,7 @@ class ResizerWidget : Widget {
}
}
void updateProps() {
protected void updateProps() {
_previousWidget = null;
_nextWidget = null;
_orientation = Orientation.Vertical;