Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TreeView] Incorrect Label2 view when element is hiden #14003

Closed
2 tasks done
Kuzma30 opened this issue May 14, 2024 · 3 comments · Fixed by #14075
Closed
2 tasks done

[TreeView] Incorrect Label2 view when element is hiden #14003

Kuzma30 opened this issue May 14, 2024 · 3 comments · Fixed by #14075
Labels
Bug This issue or PR is related to a bug Core Issue or PR touches core sections (App, Gui, Base) of FreeCAD Good first issue Suitable issues for potential first-time contributors UI/UX

Comments

@Kuzma30
Copy link
Contributor

Kuzma30 commented May 14, 2024

Is there an existing issue for this?

  • I have searched the existing issues

Problem description

When user hide Object (by pressing space) in TreeView text in Label2 column shown as normal text.
Знімок екрана з 2024-05-14 11-15-19

Full version info

OS: Ubuntu 24.04 LTS (ubuntu:GNOME/ubuntu)
Word size of FreeCAD: 64-bit
Version: 0.22.0dev.37302 (Git)
Build type: Unknown
Branch: (HEAD відʼєднано на 0e24e121eb)
Hash: 0e24e121eb3e5708c380596e0a9fd583befac977
Python 3.12.3, Qt 5.15.13, Coin 4.0.2, Vtk 9.1.0, OCC 7.6.3
Locale: Ukrainian/Ukraine (uk_UA)
Installed mods: 
  * fasteners 0.5.20

Subproject(s) affected?

None

Anything else?

No response

Code of Conduct

  • I agree to follow this project's Code of Conduct
@maxwxyz
Copy link
Collaborator

maxwxyz commented May 14, 2024

What is the expected behavior? Without the visibility icon active, show it greyed out as the object label?

@maxwxyz maxwxyz added Bug This issue or PR is related to a bug Core Issue or PR touches core sections (App, Gui, Base) of FreeCAD UI/UX Good first issue Suitable issues for potential first-time contributors labels May 14, 2024
@Kuzma30
Copy link
Contributor Author

Kuzma30 commented May 14, 2024

I think when visibility icon non active show all columns greyed as the object label.

@Kuzma30
Copy link
Contributor Author

Kuzma30 commented May 15, 2024 

diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp
index 958aacf170..29c8f3d85c 100644
--- a/src/Gui/Tree.cpp
+++ b/src/Gui/Tree.cpp
@@ -2690,20 +2690,20 @@ void TreeWidget::sortDroppedObjects(TargetItemInfo& targetInfo, std::vector<App:
 
 void TreeWidget::drawRow(QPainter* painter, const QStyleOptionViewItem& options, const QModelIndex& index) const
 {
-    QTreeWidget::drawRow(painter, options, index);
+    //QTreeWidget::drawRow(painter, options, index);^M
     // Set the text and highlighted text color of a hidden object to a dark
-    //QTreeWidgetItem * item = itemFromIndex(index);
-    //if (item->type() == ObjectType && !(static_cast<DocumentObjectItem*>(item)->previousStatus & 1)) {
-    //    QStyleOptionViewItem opt(options);
-    //    opt.state ^= QStyle::State_Enabled;
-    //    QColor c = opt.palette.color(QPalette::Inactive, QPalette::Dark);
-    //    opt.palette.setColor(QPalette::Inactive, QPalette::Text, c);
-    //    opt.palette.setColor(QPalette::Inactive, QPalette::HighlightedText, c);
-    //    QTreeWidget::drawRow(painter, opt, index);
-    //}
-    //else {
-    //    QTreeWidget::drawRow(painter, options, index);
-    //}
+    QTreeWidgetItem * item = itemFromIndex(index);^M
+    if (!isVisibilityIconEnabled() && item->type() == ObjectType && !(static_cast<DocumentObjectItem*>(item)->previousStatus & 1)) {^M
+       QStyleOptionViewItem opt(options);^M
+       opt.state ^= QStyle::State_Enabled;^M
+       QColor c = opt.palette.color(QPalette::Inactive, QPalette::Dark);^M
+       opt.palette.setColor(QPalette::Inactive, QPalette::Text, c);^M
+       opt.palette.setColor(QPalette::Inactive, QPalette::HighlightedText, c);^M
+       QTreeWidget::drawRow(painter, opt, index);^M
+    }^M
+    else {^M
+       QTreeWidget::drawRow(painter, options, index);^M
+    }^M
 }

I found this commented code and make small modification to it (add !isVisibilityIconEnabled() )
Знімок екрана з 2024-05-15 05-23-34
Знімок екрана з 2024-05-15 05-23-11

@github-actions github-actions bot mentioned this issue May 15, 2024
Closed
@NomAnor NomAnor mentioned this issue May 17, 2024
Merged
@Kuzma30 Kuzma30 mentioned this issue May 17, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Bug This issue or PR is related to a bug Core Issue or PR touches core sections (App, Gui, Base) of FreeCAD Good first issue Suitable issues for potential first-time contributors UI/UX
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Gray out all columns in the tree if an item is invisible NomAnor/FreeCAD
2 participants
@Kuzma30 @maxwxyz