Skip to content
Snippets Groups Projects

Resolves #343 GUI and Frame Refactor

Merged Nicolas Pope requested to merge feature/gui2 into master
Compare and Show latest version
3 files
+ 69
100
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -133,18 +133,21 @@ Thumbnails::~Thumbnails() {
}
bool Thumbnails::mouseButtonEvent(const nanogui::Vector2i &p, int button, bool down, int modifiers) {
if (button == 1) {
if (!down) {
context_menu_->setPosition(p - mPos);
context_menu_->setVisible(true);
return true;
bool r = View::mouseButtonEvent(p, button, down, modifiers);
if (!r) {
if (button == 1) {
if (!down) {
context_menu_->setPosition(p - mPos);
context_menu_->setVisible(true);
return true;
}
} else {
context_menu_->setVisible(false);
}
} else {
context_menu_->setVisible(false);
}
bool r = View::mouseButtonEvent(p, button, down, modifiers);
return r;
return true;
}
void Thumbnails::updateThumbnails() {
Loading