Created basic layer movement functionality (up, down) #2108

affirVega · 2021-11-24T05:35:13Z

Todo: use arrows instead of text; check if undo/redo works

…ization

data/img/material/black/move_down.svg

affirVega · 2021-11-27T16:00:41Z

So far implemented:

Reordering objects in the list
Created SVGs for buttons (thanks RiedleroD)
Every reordering pushes state to the stack, so you can undo moving up down down.

I think it's pretty much finished.

I wonder if better names can be chosen for signal/slot names and funciton names.

Also, whether move button is disabled or enabled is quite subtle. Maybe something can be done about it.

borgmanJeremy · 2021-12-03T00:03:07Z

I have not finished my review or testing, but I did find a bug.

If you try to move the layers of the circle counter, it changes the actual number inside the bubble.

affirVega · 2021-12-03T14:48:52Z

Yeah, i was able to replicate it.
I think the number on the numbered circle counter depends on it's position in the list rather that it's state. You think moving circle counters should not change it's numbers?

borgmanJeremy · 2021-12-03T14:55:02Z

Yeah I don't think moving the layer should change the number.

panpuchkov · 2021-12-07T13:33:56Z

The numbered circles automatically calculate their "Number" after performing any editing operation. We had a number of issues with them previously, especially with removing the numbered circles.
Therefore, I implemented recalculation when updating any layers (on drawing).
Not sure it should be fixed. The idea of numbered circles is to count, and it makes sense for me to have them in the correct order in the history/layers in the Tool Settings panel.

borgmanJeremy · 2021-12-07T14:10:07Z

The purpose of the numbers though is not to indicate to the user "I am on layer x", its to be used when creating step by step directions.

If I want to move a number above a rectangle, I dont really want the numbers to change.

affirVega · 2021-12-07T21:42:39Z

Numbered circles would be tricky to implemen with the state.
If you create circles 1, 2, 3 and then remove 2, should 3 get number 2?
What if we add ability to edit number, like with spinbox?

borgmanJeremy · 2021-12-07T22:19:39Z

@mmahmoudian thoughts on this?

panpuchkov · 2021-12-08T07:54:46Z

Numbered circles would be tricky to implemen with the state. If you create circles 1, 2, 3 and then remove 2, should 3 get number 2? What if we add ability to edit number, like with spinbox?

According to our (Namecheap) use cases "Number circles" should be sequential without missing. It's like an instruction what to do next. This is on of the killer features for us. And I have spent some time on fixing it in the past.
I think that the majority needs the same. If you really want to add spinner, as for me it should be another tool.

I agree with @borgmanJeremy that numbers should remain the same after layers movement, his point is true: "its to be used when creating step by step directions". That is exactly how our team use it. I've asked them.

As for me the behavior should remain the same, just don't renumber when updating the layer order. We need to update algorithm and do not recalculate the "number" on draw event, do it just on remove any numbered circle.

mmahmoudian · 2021-12-08T09:21:34Z

I haven't tested this yet, so my understanding is only based on the discussion in this thread. That said,

@mmahmoudian thoughts on this?

I can think of it as feature and as bug. It has happened to me that I wanted to switch numbers and I had to drag them or undo and recreate them. I perhaps lean towards this as feature.

The purpose of the numbers though is not to indicate to the user "I am on layer x"

Agreed that it should not display the layer number, but would be cool to show the circle counter layer order.

If I want to move a number above a rectangle, I dont really want the numbers to change.

Then why not moving that rectangle layer?

According to our (Namecheap) use cases "Number circles" should be sequential without missing.

From time to time I need to skip a number because that step is in another screenshot. To to the trick, I have put the circles of those numbers I don't want out side of the screenshot area. So to sum up, I agree that it should be sequential without missing number.

What if we add ability to edit number, like with spinbox?

I think @veracioux or @borgmanJeremy added a feature a while back to reset the counter to start from 0. I personally don't see a need for a feature to modify the number as in an odd case if someone wants it as a one-time thing they can manually create it with circle tool and text tool.

But if you all think that there is a need, then I can suggest that perhaps we can make it so:

The user creates the counter
The counter by default as a value of "auto"
If user want to change it, they can select it and from the sidebar in a text box change "auto" to "1234"
the user can modify the number

I believe it is relatively important to be able to start from 1 as someone might have a set of counters in red and another counter as blue. This would perhaps adds some complexity to the layer order thing if the user moves some of the blue counters in between the red ones.

Ps. I hope I have correctly conveyed what I had in mind. If something is vague in my sentences I can explain.

affirVega · 2021-12-23T13:34:53Z

I think it's ready to be tested.

Also, updated the arrows SVGs. I think these work better.

Did a little gifs that showcase this feature. https://imgur.com/a/WPWMawW

RiedleroD · 2021-12-24T12:54:06Z

I just noticed you have dark mode enabled, but the icons are still black. Shouldn't they be white in dark mode?

edit: also I noticed your white versions of the icons are colored #FEFFFF - which is not pure white. #FFF or #FFFFFF is.

affirVega · 2021-12-24T13:18:27Z

I just noticed you have dark mode enabled, but the icons are still black. Shouldn't they be white in dark mode?

It would be good to implement that. In this row, in code, there was only trash can, but it's always black. I'll try to look into it today.

edit: also I noticed your white versions of the icons are colored #FEFFFF - which is not pure white. #FFF or #FFFFFF is.

Okay, gonna fix this! Also it seems that the arrow down ↓ is slightly shorter than the arrow up ↑, so put that to the list.

…to #fff

…theme

affirVega · 2021-12-24T20:36:13Z

Okay, fixed the arrows and color!

Also, white trash can was not included in resources, so I added it.

To clarify, this PR is ready for testing.

borgmanJeremy · 2021-12-24T20:36:24Z

Thanks, I'll get this tested soon. I've been busy QA testing for the version 11 release. I'd like to wait to merge this until after version 11 since I've sunk so much time into testing.

affirVega · 2022-01-25T17:35:53Z

Hello! Just wanted to ping here and tell I'm ready to make changes in case of bugs.

borgmanJeremy · 2022-01-25T19:19:35Z

Thanks, sorry we have been really bogged down on the version 11 release but that is starting to slow down.

borgmanJeremy

Thanks for the work on this. It's almost ready to merge. When I did testing on it I found an issue with the display of the sidebar on MacOs

The addition of the Move buttons cause the layout to spill over. The buttons need to be configured to fit in the existing size so it doest push the layout over.

borgmanJeremy · 2022-01-25T19:53:28Z

src/widgets/capture/capturewidget.cpp

@@ -1623,6 +1675,10 @@ void CaptureWidget::redo()
    drawToolsData();
    update();
    updateLayersPanel();
+
+    // FIXME restore m_context.circleCount since this state isn't saved in undo


Can you clarify what needs to be done to remove this FIXME?

src/widgets/capture/capturewidget.cpp

affirVega · 2022-01-27T16:32:30Z

Okay, got it with the layout.

By the way, I don't know if this is related, but on windows the sidebar has scroll down in my screen, and this is release version v11.0.0 (ad1bf28) Compiled with Qt 5.15.2 on winnt: 10.0.19043

borgmanJeremy · 2022-01-28T18:20:27Z

When you said "got it" did you mean you pushed a fix? It's not fixed for me. I'm not too hung up on you fixing this if its hard to chase down. I'm working on reimpleneting all the widgets in Qt Designer so I can resolve it when I redo the side bar.

affirVega · 2022-01-29T13:21:34Z

Sorry for the confusion, I meant I understood your message about the problem. I am looking into the it and into ways to fix it right now. I will let you know until tomorrow on how that turned out.

…rcleCount

affirVega · 2022-01-29T18:50:16Z

Hello! I got some results.

Reason why my sidebar had scroll is color picker text is too long. Right now panel width is calculated from color picker's width.
I've set minimalWidth to button's height in hope to make buttons resize.
Fixed bug of mine, this should equal 0.

Please test on your machine and tell if buttons shrink now.

borgmanJeremy · 2022-01-29T19:18:47Z

Thanks, that resolves the issue on my machine as well.

…2108) * Created basic layer movement functionality (up, down) * Replaced `and` and `or` with `&&` and `||`, added constructor initialization * Added move icons. Added that moving layers pushes state to undo stack. * Cleaned svgs. * Circle counter doesn't change nubmer when reordered anymore * Changed move arrow SVGs * Make down arrow in size with up arrow, fix white colors from #feffff to #fff * SVGs in unitilypanel for buttons now choose color depending on color theme * Refactor tool removing code, removed fixme, fixed bug with minimal circleCount * Set minimal width for buttons Co-authored-by: Feskow Vega <affirvega@krutt.org> (cherry picked from commit 1cc5a26)

Feskow Vega added 2 commits November 24, 2021 00:09

Created basic layer movement functionality (up, down)

8027ad8

Replaced and and or with && and ||, added constructor initial…

a2f1fd7

…ization

affirVega force-pushed the move_layers branch from b376718 to a2f1fd7 Compare November 27, 2021 15:17

Added move icons. Added that moving layers pushes state to undo stack.

62c76b6

RiedleroD suggested changes Nov 27, 2021

View reviewed changes

data/img/material/black/move_down.svg Outdated Show resolved Hide resolved

Cleaned svgs.

66472b5

Circle counter doesn't change nubmer when reordered anymore

cf5c4c1

affirVega mentioned this pull request Dec 14, 2021

Set circle count on "Ctrl+Scroll Wheel" #2162

Closed

Changed move arrow SVGs

a72cf82

Feskow Vega added 2 commits December 24, 2021 23:32

Make down arrow in size with up arrow, fix white colors from #feffff …

70363fa

…to #fff

SVGs in unitilypanel for buttons now choose color depending on color …

c08a3d7

…theme

borgmanJeremy suggested changes Jan 26, 2022

View reviewed changes

Feskow Vega added 2 commits January 29, 2022 21:48

Refactor tool removing code, removed fixme, fixed bug with minimal ci…

7f69b0f

…rcleCount

Set minimal width for buttons

2a59d4d

borgmanJeremy merged commit 1cc5a26 into flameshot-org:master Jan 29, 2022

affirVega mentioned this pull request Jan 30, 2022

Moving layers #2106

Closed

mmahmoudian mentioned this pull request Feb 4, 2022

write text on solid background #2358

Open

RiedleroD mentioned this pull request Apr 2, 2022

Optimized some new SVGs #2523

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Created basic layer movement functionality (up, down) #2108

Created basic layer movement functionality (up, down) #2108

affirVega commented Nov 24, 2021

affirVega commented Nov 27, 2021 •

edited

Loading

borgmanJeremy commented Dec 3, 2021

affirVega commented Dec 3, 2021

borgmanJeremy commented Dec 3, 2021

panpuchkov commented Dec 7, 2021

borgmanJeremy commented Dec 7, 2021

affirVega commented Dec 7, 2021

borgmanJeremy commented Dec 7, 2021

panpuchkov commented Dec 8, 2021

mmahmoudian commented Dec 8, 2021

affirVega commented Dec 23, 2021

RiedleroD commented Dec 24, 2021 •

edited

Loading

affirVega commented Dec 24, 2021

affirVega commented Dec 24, 2021

borgmanJeremy commented Dec 24, 2021

affirVega commented Jan 25, 2022

borgmanJeremy commented Jan 25, 2022

borgmanJeremy left a comment

borgmanJeremy Jan 25, 2022

affirVega commented Jan 27, 2022

borgmanJeremy commented Jan 28, 2022

affirVega commented Jan 29, 2022 •

edited

Loading

affirVega commented Jan 29, 2022

borgmanJeremy commented Jan 29, 2022

Created basic layer movement functionality (up, down) #2108

Created basic layer movement functionality (up, down) #2108

Conversation

affirVega commented Nov 24, 2021

affirVega commented Nov 27, 2021 • edited Loading

borgmanJeremy commented Dec 3, 2021

affirVega commented Dec 3, 2021

borgmanJeremy commented Dec 3, 2021

panpuchkov commented Dec 7, 2021

borgmanJeremy commented Dec 7, 2021

affirVega commented Dec 7, 2021

borgmanJeremy commented Dec 7, 2021

panpuchkov commented Dec 8, 2021

mmahmoudian commented Dec 8, 2021

affirVega commented Dec 23, 2021

RiedleroD commented Dec 24, 2021 • edited Loading

affirVega commented Dec 24, 2021

affirVega commented Dec 24, 2021

borgmanJeremy commented Dec 24, 2021

affirVega commented Jan 25, 2022

borgmanJeremy commented Jan 25, 2022

borgmanJeremy left a comment

Choose a reason for hiding this comment

borgmanJeremy Jan 25, 2022

Choose a reason for hiding this comment

affirVega commented Jan 27, 2022

borgmanJeremy commented Jan 28, 2022

affirVega commented Jan 29, 2022 • edited Loading

affirVega commented Jan 29, 2022

borgmanJeremy commented Jan 29, 2022

affirVega commented Nov 27, 2021 •

edited

Loading

RiedleroD commented Dec 24, 2021 •

edited

Loading

affirVega commented Jan 29, 2022 •

edited

Loading