- template file update
- minor fixes
This commit is contained in:
1 parent
f698ad2fb6
commit
e0f3921a75
3 files changed
+6
-6
No files matched your search
@@ -141,8 +141,8 @@
|
|||||||
OnScreenWidgetView.isHorizontallyAligned = false;
|
OnScreenWidgetView.isHorizontallyAligned = false;
|
||||||
for (CALayer *button in self.OSCButtonLayerPool) { // horizontal guideline position check
|
for (CALayer *button in self.OSCButtonLayerPool) { // horizontal guideline position check
|
||||||
if ((layerBeingDragged != button) && !button.isHidden) {
|
if ((layerBeingDragged != button) && !button.isHidden) {
|
||||||
if ((horizontalGuideline.center.y < button.position.y + 2) &&
|
if ((horizontalGuideline.center.y < button.position.y + 1) &&
|
||||||
(horizontalGuideline.center.y > button.position.y - 2)) {
|
(horizontalGuideline.center.y > button.position.y - 1)) {
|
||||||
horizontalGuideline.backgroundColor = [UIColor yellowColor];
|
horizontalGuideline.backgroundColor = [UIColor yellowColor];
|
||||||
OnScreenWidgetView.isHorizontallyAligned = true;
|
OnScreenWidgetView.isHorizontallyAligned = true;
|
||||||
OnScreenWidgetView.alignedY = button.position.y;
|
OnScreenWidgetView.alignedY = button.position.y;
|
||||||
@@ -155,7 +155,7 @@
|
|||||||
OnScreenWidgetView* otherWidget = (OnScreenWidgetView *) view;
|
OnScreenWidgetView* otherWidget = (OnScreenWidgetView *) view;
|
||||||
if(widget.isHidden) continue;
|
if(widget.isHidden) continue;
|
||||||
if(widget.isFolder && widget.bulkMoveEnabled && [widget.sequenceSet containsObject:@(otherWidget.sequence)]) break;
|
if(widget.isFolder && widget.bulkMoveEnabled && [widget.sequenceSet containsObject:@(otherWidget.sequence)]) break;
|
||||||
if((horizontalGuideline.center.y < view.center.y + 2) && (horizontalGuideline.center.y > view.center.y - 2)) {
|
if((horizontalGuideline.center.y < view.center.y + 1) && (horizontalGuideline.center.y > view.center.y - 1)) {
|
||||||
horizontalGuideline.backgroundColor = [UIColor yellowColor];
|
horizontalGuideline.backgroundColor = [UIColor yellowColor];
|
||||||
OnScreenWidgetView.isHorizontallyAligned = true;
|
OnScreenWidgetView.isHorizontallyAligned = true;
|
||||||
OnScreenWidgetView.alignedY = view.center.y;
|
OnScreenWidgetView.alignedY = view.center.y;
|
||||||
@@ -168,8 +168,8 @@
|
|||||||
OnScreenWidgetView.isVerticallyAligned = false;
|
OnScreenWidgetView.isVerticallyAligned = false;
|
||||||
for (CALayer *button in self.OSCButtonLayerPool) { // vertical guideline position check
|
for (CALayer *button in self.OSCButtonLayerPool) { // vertical guideline position check
|
||||||
if ((layerBeingDragged != button) && !button.isHidden) {
|
if ((layerBeingDragged != button) && !button.isHidden) {
|
||||||
if ((verticalGuideline.center.x < button.position.x + 2) &&
|
if ((verticalGuideline.center.x < button.position.x + 1) &&
|
||||||
(verticalGuideline.center.x > button.position.x - 2)) {
|
(verticalGuideline.center.x > button.position.x - 1)) {
|
||||||
verticalGuideline.backgroundColor = [UIColor yellowColor];
|
verticalGuideline.backgroundColor = [UIColor yellowColor];
|
||||||
OnScreenWidgetView.isVerticallyAligned = true;
|
OnScreenWidgetView.isVerticallyAligned = true;
|
||||||
OnScreenWidgetView.alignedX = button.position.x;
|
OnScreenWidgetView.alignedX = button.position.x;
|
||||||
@@ -180,7 +180,7 @@
|
|||||||
for(UIView* view in self.layoutToolVC.view.subviews){
|
for(UIView* view in self.layoutToolVC.view.subviews){
|
||||||
if ([view isKindOfClass:[OnScreenWidgetView class]] && view != widget) {
|
if ([view isKindOfClass:[OnScreenWidgetView class]] && view != widget) {
|
||||||
if(view.isHidden) continue;
|
if(view.isHidden) continue;
|
||||||
if ((verticalGuideline.center.x < view.center.x + 2) && (verticalGuideline.center.x > view.center.x - 2)) {
|
if ((verticalGuideline.center.x < view.center.x + 1) && (verticalGuideline.center.x > view.center.x - 1)) {
|
||||||
verticalGuideline.backgroundColor = [UIColor yellowColor];
|
verticalGuideline.backgroundColor = [UIColor yellowColor];
|
||||||
OnScreenWidgetView.isVerticallyAligned = true;
|
OnScreenWidgetView.isVerticallyAligned = true;
|
||||||
OnScreenWidgetView.alignedX = view.center.x;
|
OnScreenWidgetView.alignedX = view.center.x;
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user