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.

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

Basic block highlight #1533

Merged
merged 13 commits into from
May 23, 2019
Merged

Basic block highlight #1533

merged 13 commits into from
May 23, 2019

Conversation

optizone
Copy link
Contributor

Detailed description
Adds basic block highlight and adds alpha channel for color of word and line highlight.
Graph overview honors the color of basic block as well.
Alpha channel bar appears only when word or line highlight option is selected.
"Unhighlight block" action appears only when user right clicks on highlighted block.

screen_1
screen2
image

@xarkes
Copy link
Member

xarkes commented May 15, 2019

I will try to review when I'll be back home late tonight.

@optizone
Copy link
Contributor Author

added some optimization to ColorPicker. Now it works way faster than it did before.

Copy link
Member

@xarkes xarkes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't finish but that's a start heh.

src/Main.cpp Outdated
@@ -69,7 +70,7 @@ int main(int argc, char *argv[])
}
ThemeWorker().save(QJsonDocument(updatedTheme), theme);
}
settings.setValue("updated_custom_themes", true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you want to rename it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since I added new color options like wordHighlight and lineHighlight (which were replaced with r2 options wordhl and linehl in this commit for some reason) we need to update custom theme files

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a version for the color themes to https://github.com/radareorg/cutter/pull/1557
So after this is merged, you just have to raise this version by one instead of adding more settings keys every time.

src/common/ColorThemeWorker.cpp Show resolved Hide resolved
Copy link
Member

@xarkes xarkes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, can be merged after adding change for https://github.com/radareorg/cutter/pull/1557

Copy link
Member

@ITAYC0HEN ITAYC0HEN left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have issues. reported privately and will update here after getting answer

@ITAYC0HEN
Copy link
Member

Works very good! well done :)
I don't see the alpha channel bar though:

image

@optizone
Copy link
Contributor Author

You should not. Alpha channel is only for line highlight and word highlight options.

Copy link
Member

@thestr4ng3r thestr4ng3r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from these small things, lgtm!

src/common/ColorThemeWorker.h Outdated Show resolved Hide resolved
src/widgets/ColorPicker.cpp Outdated Show resolved Hide resolved
src/widgets/ColorPicker.cpp Outdated Show resolved Hide resolved
src/widgets/DisassemblerGraphView.cpp Outdated Show resolved Hide resolved
optizone and others added 4 commits May 23, 2019 19:03
Co-Authored-By: Florian Märkl <info@florianmaerkl.de>
Co-Authored-By: Florian Märkl <info@florianmaerkl.de>
Co-Authored-By: Florian Märkl <info@florianmaerkl.de>
@thestr4ng3r thestr4ng3r merged commit 31838a3 into rizinorg:master May 23, 2019
@optizone optizone deleted the bbhighlight branch May 23, 2019 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants