mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2025-03-14 16:09:41 +08:00
Compare commits
No commits in common. "7204e18afee9ce1b55debca723b5a462e2e253f3" and "1a8e3d5ab2789b5c145fea55accdc4a8e81ef059" have entirely different histories.
7204e18afe
...
1a8e3d5ab2
@ -47,17 +47,6 @@ Button{
|
||||
implicitWidth: 326
|
||||
implicitHeight: 560
|
||||
closePolicy: Popup.CloseOnEscape
|
||||
onClosed: {
|
||||
text_box_r.focus = false;
|
||||
text_box_g.focus = false;
|
||||
text_box_b.focus = false;
|
||||
text_box_a.focus = false;
|
||||
text_box_color.focus = false;
|
||||
}
|
||||
onOpened: {
|
||||
layout_color_hue.updateColorText(current);
|
||||
text_box_color.textEdited();
|
||||
}
|
||||
Rectangle{
|
||||
id:layout_actions
|
||||
width: parent.width
|
||||
@ -159,9 +148,7 @@ Button{
|
||||
if(color.a===1){
|
||||
colorString = "FF"+colorString
|
||||
}
|
||||
if (!text_box_color.activeFocus) {
|
||||
text_box_color.text = colorString.toUpperCase();
|
||||
}
|
||||
text_box_color.text = colorString.toUpperCase()
|
||||
}
|
||||
property color blackColor: {
|
||||
var c = whiteColor
|
||||
@ -292,11 +279,6 @@ Button{
|
||||
preventStealing: true
|
||||
function handleMouse(mouse) {
|
||||
if (mouse.buttons & Qt.LeftButton) {
|
||||
text_box_r.focus = false;
|
||||
text_box_g.focus = false;
|
||||
text_box_b.focus = false;
|
||||
text_box_a.focus = false;
|
||||
text_box_color.focus = false;
|
||||
pickerCursor.x = Math.max(0,Math.min(mouse.x - colorHandleRadius,width-2*colorHandleRadius));
|
||||
pickerCursor.y = Math.max(0,Math.min(mouse.y - colorHandleRadius,height-2*colorHandleRadius));
|
||||
}
|
||||
@ -387,11 +369,6 @@ Button{
|
||||
preventStealing: true
|
||||
function handleMouse(mouse) {
|
||||
if (mouse.buttons & Qt.LeftButton) {
|
||||
text_box_r.focus = false;
|
||||
text_box_g.focus = false;
|
||||
text_box_b.focus = false;
|
||||
text_box_a.focus = false;
|
||||
text_box_color.focus = false;
|
||||
blackCursor.x = Math.max(0,Math.min(mouse.x - 6,width-2*6));
|
||||
blackCursor.y = 0
|
||||
}
|
||||
@ -461,11 +438,6 @@ Button{
|
||||
preventStealing: true
|
||||
function handleMouse(mouse) {
|
||||
if (mouse.buttons & Qt.LeftButton) {
|
||||
text_box_r.focus = false;
|
||||
text_box_g.focus = false;
|
||||
text_box_b.focus = false;
|
||||
text_box_a.focus = false;
|
||||
text_box_color.focus = false;
|
||||
opacityCursor.x = Math.max(0,Math.min(mouse.x - 6,width-2*6));
|
||||
opacityCursor.y = 0
|
||||
}
|
||||
@ -500,7 +472,7 @@ Button{
|
||||
id:text_box_color
|
||||
width: 136
|
||||
validator: RegularExpressionValidator {
|
||||
regularExpression: /^[0-9A-Fa-f]{8}$/
|
||||
regularExpression: /^[0-9A-F]{8}$/
|
||||
}
|
||||
anchors{
|
||||
right: parent.right
|
||||
@ -523,11 +495,6 @@ Button{
|
||||
parseInt(colorString.substring(6, 8), 16) / 255,
|
||||
parseInt(colorString.substring(0, 2), 16) / 255)
|
||||
layout_color_hue.colorValue = c
|
||||
layout_color_hue.updateColorText(c);
|
||||
text_box_r.textEdited();
|
||||
text_box_g.textEdited();
|
||||
text_box_b.textEdited();
|
||||
text_box_a.textEdited();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -31,15 +31,21 @@ Page {
|
||||
interactive: false
|
||||
orientation: ListView.Horizontal
|
||||
highlightMoveDuration: FluTheme.animationEnabled ? 167 : 0
|
||||
highlightResizeDuration: FluTheme.animationEnabled ? 167 : 0
|
||||
highlight: Item{
|
||||
clip: true
|
||||
Rectangle{
|
||||
height: 3
|
||||
radius: 1.5
|
||||
color: FluTheme.primaryColor
|
||||
width: nav_list.currentItem.width
|
||||
width: nav_list.currentItem ? nav_list.currentItem.width : 0
|
||||
y:d.tabY
|
||||
Behavior on width {
|
||||
enabled: FluTheme.animationEnabled
|
||||
NumberAnimation{
|
||||
duration: 167
|
||||
easing.type: Easing.OutCubic
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
delegate: Button{
|
||||
|
||||
@ -48,17 +48,6 @@ Button{
|
||||
implicitWidth: 326
|
||||
implicitHeight: 560
|
||||
closePolicy: Popup.CloseOnEscape
|
||||
onClosed: {
|
||||
text_box_r.focus = false;
|
||||
text_box_g.focus = false;
|
||||
text_box_b.focus = false;
|
||||
text_box_a.focus = false;
|
||||
text_box_color.focus = false;
|
||||
}
|
||||
onOpened: {
|
||||
layout_color_hue.updateColorText(current);
|
||||
text_box_color.textEdited();
|
||||
}
|
||||
Rectangle{
|
||||
id:layout_actions
|
||||
width: parent.width
|
||||
@ -160,9 +149,7 @@ Button{
|
||||
if(color.a===1){
|
||||
colorString = "FF"+colorString
|
||||
}
|
||||
if (!text_box_color.activeFocus) {
|
||||
text_box_color.text = colorString.toUpperCase();
|
||||
}
|
||||
text_box_color.text = colorString.toUpperCase()
|
||||
}
|
||||
property color blackColor: {
|
||||
var c = whiteColor
|
||||
@ -293,11 +280,6 @@ Button{
|
||||
preventStealing: true
|
||||
function handleMouse(mouse) {
|
||||
if (mouse.buttons & Qt.LeftButton) {
|
||||
text_box_r.focus = false;
|
||||
text_box_g.focus = false;
|
||||
text_box_b.focus = false;
|
||||
text_box_a.focus = false;
|
||||
text_box_color.focus = false;
|
||||
pickerCursor.x = Math.max(0,Math.min(mouse.x - colorHandleRadius,width-2*colorHandleRadius));
|
||||
pickerCursor.y = Math.max(0,Math.min(mouse.y - colorHandleRadius,height-2*colorHandleRadius));
|
||||
}
|
||||
@ -388,11 +370,6 @@ Button{
|
||||
preventStealing: true
|
||||
function handleMouse(mouse) {
|
||||
if (mouse.buttons & Qt.LeftButton) {
|
||||
text_box_r.focus = false;
|
||||
text_box_g.focus = false;
|
||||
text_box_b.focus = false;
|
||||
text_box_a.focus = false;
|
||||
text_box_color.focus = false;
|
||||
blackCursor.x = Math.max(0,Math.min(mouse.x - 6,width-2*6));
|
||||
blackCursor.y = 0
|
||||
}
|
||||
@ -462,11 +439,6 @@ Button{
|
||||
preventStealing: true
|
||||
function handleMouse(mouse) {
|
||||
if (mouse.buttons & Qt.LeftButton) {
|
||||
text_box_r.focus = false;
|
||||
text_box_g.focus = false;
|
||||
text_box_b.focus = false;
|
||||
text_box_a.focus = false;
|
||||
text_box_color.focus = false;
|
||||
opacityCursor.x = Math.max(0,Math.min(mouse.x - 6,width-2*6));
|
||||
opacityCursor.y = 0
|
||||
}
|
||||
@ -501,7 +473,7 @@ Button{
|
||||
id:text_box_color
|
||||
width: 136
|
||||
validator: RegularExpressionValidator {
|
||||
regularExpression: /^[0-9A-Fa-f]{8}$/
|
||||
regularExpression: /^[0-9A-F]{8}$/
|
||||
}
|
||||
anchors{
|
||||
right: parent.right
|
||||
@ -524,11 +496,6 @@ Button{
|
||||
parseInt(colorString.substring(6, 8), 16) / 255,
|
||||
parseInt(colorString.substring(0, 2), 16) / 255)
|
||||
layout_color_hue.colorValue = c
|
||||
layout_color_hue.updateColorText(c);
|
||||
text_box_r.textEdited();
|
||||
text_box_g.textEdited();
|
||||
text_box_b.textEdited();
|
||||
text_box_a.textEdited();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -32,15 +32,21 @@ Page {
|
||||
interactive: false
|
||||
orientation: ListView.Horizontal
|
||||
highlightMoveDuration: FluTheme.animationEnabled ? 167 : 0
|
||||
highlightResizeDuration: FluTheme.animationEnabled ? 167 : 0
|
||||
highlight: Item{
|
||||
clip: true
|
||||
Rectangle{
|
||||
height: 3
|
||||
radius: 1.5
|
||||
color: FluTheme.primaryColor
|
||||
width: nav_list.currentItem.width
|
||||
width: nav_list.currentItem ? nav_list.currentItem.width : 0
|
||||
y:d.tabY
|
||||
Behavior on width {
|
||||
enabled: FluTheme.animationEnabled
|
||||
NumberAnimation{
|
||||
duration: 167
|
||||
easing.type: Easing.OutCubic
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
delegate: Button{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user