diff --git a/gloss/ContentView.swift b/gloss/ContentView.swift index 114839f..36934da 100644 --- a/gloss/ContentView.swift +++ b/gloss/ContentView.swift @@ -153,26 +153,31 @@ struct RibbonCrown : View { .if(draggedRibbon != nil && draggedRibbon!.id == ribbon.id && isDragging) { $0.overlay(Color(red: 0.1, green: 0.1, blue: 0.1)) } + .offset(x: 10) + Text(ribbon.title) .foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) // .foregroundColor(.white)) // .foregroundColor(.black) .frame(minWidth: CGFloat(70), maxWidth: CGFloat(70), minHeight: height, maxHeight: height, alignment: .center) + .if(draggedRibbon != nil && draggedRibbon!.id == ribbon.id && isDragging) { $0.overlay(Color(red: 0.1, green: 0.1, blue: 0.1)) } // .if(!isDragging || draggedRibbon == nil || draggedRibbon!.id != ribbon.id) { $0.background(Color(red: 0.1, green: 0.1, blue: 0.1)) } // .if(draggedRibbon != nil && draggedRibbon!.id == ribbon.id) { $0.background(.red) } .background(Color(red: 0.1, green: 0.1, blue: 0.1)) + .offset(x: 10) // .background(Color(red: 0.1, green: 0.1, blue: 0.1)) // .background(.red) // .background(.yellow) .multilineTextAlignment(.center) // .minimumScaleFactor(0.5) - .padding([.top, .bottom], 10) + // .padding([.top, .bottom], 10) .font(Font.custom("AveriaSerifLibre-Regular", size: CGFloat(10))) } + .frame(width: CGFloat(100 * 1.66 * scale + 10 ), height:CGFloat(100 * scale + 5)) // Text(ribbon.title) // .foregroundColor(Color(UIColor(red: 0.76, green: 0.76, blue: 0.76, alpha: 1.00))) @@ -397,6 +402,7 @@ struct ContentView: View { draggedRibbon: draggedRibbon, isDragging: isDragging ) + // .offset(x: 6, y: 6) .onDrag { self.draggedRibbon = ribbon return NSItemProvider() @@ -926,6 +932,7 @@ struct DropViewDelegate2: DropDelegate { } func performDrop(info: DropInfo) -> Bool { + isDragging = false return true }