Skip to content

Commit

Permalink
Merge pull request #25215 from mike-spa/revertAnchorsRegression
Browse files Browse the repository at this point in the history
Revert "fixed #22273: not for text elements"
  • Loading branch information
RomanPudashkin committed Oct 23, 2024
1 parent c375cdf commit 458bdb7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/notation/tests/notationviewinputcontroller_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ TEST_F(NotationViewInputControllerTests, Mouse_Press_Range_Start_Drag_From_Selec
* @details User pressed left mouse button on already selected text element
* We should change text cursor position
*/
TEST_F(NotationViewInputControllerTests, Mouse_Press_On_Selected_Text_Element)
TEST_F(NotationViewInputControllerTests, DISABLED_Mouse_Press_On_Selected_Text_Element)
{
//! [GIVEN] There is a test score
engraving::MasterScore* score = engraving::ScoreRW::readScore(TEST_SCORE_PATH);
Expand Down
2 changes: 1 addition & 1 deletion src/notation/view/notationviewinputcontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ void NotationViewInputController::handleLeftClick(const ClickContext& ctx)
INotationSelectionPtr selection = viewInteraction()->selection();

if (!selection->isRange()) {
if (ctx.hitElement && ctx.hitElement->needStartEditingAfterSelecting() && !ctx.hitElement->isTextBase()) {
if (ctx.hitElement && ctx.hitElement->needStartEditingAfterSelecting()) {
if (ctx.hitElement->hasGrips() && !ctx.hitElement->isImage() && selection->elements().size() == 1) {
viewInteraction()->startEditGrip(ctx.hitElement, ctx.hitElement->gripsCount() > 4 ? Grip::DRAG : Grip::MIDDLE);
} else {
Expand Down

0 comments on commit 458bdb7

Please sign in to comment.