diff --git a/example/T_TabView.qml b/example/T_TabView.qml index 242fe37..972f43c 100644 --- a/example/T_TabView.qml +++ b/example/T_TabView.qml @@ -8,6 +8,20 @@ FluScrollablePage{ title:"TabView" + Component{ + id:com_page + Rectangle{ + anchors.fill: parent + color: argument + } + } + + Component.onCompleted: { + var colors = [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green] + for(var i =0;i 0) scroll_nav.decrease() + else scroll_nav.increase() + } + onPressed: { + d.itemPress = true item_container.timestamp = new Date().getTime(); d.dragBehavior = false; var pos = tab_nav.mapFromItem(item_container, 0, 0) @@ -112,9 +113,10 @@ Item { } onReleased: { + d.itemPress = false + timer.stop() var timeDiff = new Date().getTime() - item_container.timestamp - console.debug(timeDiff) - if (timeDiff < 150) { + if (timeDiff < 300) { tab_nav.currentIndex = index } d.dragIndex = -1; @@ -128,9 +130,41 @@ Item { } onPositionChanged: { - var pos = tab_nav.mapFromItem(item_container, 0, 0); - var idx = tab_nav.indexAt(pos.x, pos.y); - if (idx > -1 && idx < tab_nav.count) { + var pos = tab_nav.mapFromItem(item_container, 0, 0) + updatePosition(pos) + if(pos.x<0){ + timer.isIncrease = false + timer.restart() + }else if(pos.x>tab_nav.width-itemWidth){ + timer.isIncrease = true + timer.restart() + } + } + Timer{ + id:timer + property bool isIncrease: true + interval: 10 + repeat: true + onTriggered: { + if(isIncrease){ + if(tab_nav.contentX>=tab_nav.contentWidth-tab_nav.width){ + return + } + tab_nav.contentX = tab_nav.contentX+1 + }else{ + if(tab_nav.contentX<=0){ + return + } + tab_nav.contentX = tab_nav.contentX-1 + } + item_mouse_drag.updatePosition(tab_nav.mapFromItem(item_container, 0, 0)) + } + } + function updatePosition(pos){ + var idx = tab_nav.indexAt(pos.x+tab_nav.contentX, pos.y) + var firstIdx = tab_nav.indexAt(tab_nav.contentX+1, pos.y) + var lastIdx = tab_nav.indexAt(tab_nav.width+tab_nav.contentX-1, pos.y) + if (idx >= firstIdx && idx <= lastIdx && d.dragIndex !== idx) { tab_model.move(d.dragIndex, idx, 1) d.dragIndex = idx; } @@ -141,7 +175,7 @@ Item { anchors.fill: parent color: { if(FluTheme.isDark){ - if(item_mouse_hove.containsMouse){ + if(item_mouse_hove.containsMouse || item_btn_close.hovered){ return Qt.rgba(1,1,1,0.03) } if(tab_nav.currentIndex === index){ @@ -149,7 +183,7 @@ Item { } return Qt.rgba(0,0,0,0) }else{ - if(item_mouse_hove.containsMouse){ + if(item_mouse_hove.containsMouse || item_btn_close.hovered){ return Qt.rgba(0,0,0,0.03) } if(tab_nav.currentIndex === index){ @@ -168,6 +202,7 @@ Item { } FluIconButton{ + id:item_btn_close iconSource: FluentIcons.ChromeClose iconSize: 10 width: 24 @@ -177,9 +212,48 @@ Item { rightMargin: 5 verticalCenter: parent.verticalCenter } + onClicked: { + tab_model.remove(index) + } } } } } } + + + Item{ + id:container + anchors{ + top: tab_nav.bottom + left: parent.left + right: parent.right + bottom: parent.bottom + } + + Repeater{ + model:tab_model + Loader{ + property var argument: model.argument + anchors.fill: parent + sourceComponent: model.page + visible: tab_nav.currentIndex === index + } + } + } + + + function createTab(icon,text,page,argument={}){ + return {icon:icon,text:text,page:page,argument:argument} + } + + function appendTab(icon,text,page,argument){ + tab_model.append(createTab(icon,text,page,argument)) + } + + function setTabList(list){ + tab_model.clear() + tab_model.append(list) + } + }