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

toggle fullscreen button for ImageDisplay #1803

Merged
merged 4 commits into from
Apr 17, 2024
Merged

toggle fullscreen button for ImageDisplay #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
767911c
ImageDisplay: toggle fullscreen button
rhaschke Sep 16, 2023
697194c
Maximizing works...
rhaschke Sep 16, 2023
6d4b8e7
Use icon instead of text
rhaschke Apr 17, 2024
065d904
Move core functionality into PanelDockWidget
rhaschke Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/rviz/default_plugin/camera_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#include <rviz/properties/float_property.h>
#include <rviz/properties/int_property.h>
#include <rviz/properties/ros_topic_property.h>
#include <rviz/panel_dock_widget.h>
#include <rviz/render_panel.h>
#include <rviz/uniform_string_stream.h>
#include <rviz/validate_floats.h>
Expand Down Expand Up @@ -192,6 +193,7 @@ void CameraDisplay::onInitialize()
render_panel_->initialize(context_->getSceneManager(), context_);

setAssociatedWidget(render_panel_);
getAssociatedWidgetPanel()->addMaximizeButton();

render_panel_->setAutoRender(false);
render_panel_->setOverlaysEnabled(false);
Expand Down
2 changes: 2 additions & 0 deletions src/rviz/default_plugin/image_display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

#include <rviz/display_context.h>
#include <rviz/frame_manager.h>
#include <rviz/panel_dock_widget.h>
#include <rviz/ogre_helpers/compatibility.h>
#include <rviz/render_panel.h>
#include <rviz/validate_floats.h>
Expand Down Expand Up @@ -125,6 +126,7 @@ void ImageDisplay::onInitialize()
render_panel_->initialize(img_scene_manager_, context_);

setAssociatedWidget(render_panel_);
getAssociatedWidgetPanel()->addMaximizeButton();

render_panel_->setAutoRender(false);
render_panel_->setOverlaysEnabled(false);
Expand Down
24 changes: 24 additions & 0 deletions src/rviz/panel_dock_widget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,30 @@ void PanelDockWidget::setContentWidget(QWidget* child)
}
}

void PanelDockWidget::addMaximizeButton()
{
QToolButton* button = new QToolButton();
button->setIcon(QIcon::fromTheme("view-fullscreen"));
button->setIconSize(QSize(10, 10));
button->setToolTip("Toggle maximize");
connect(button, &QToolButton::clicked, this, &PanelDockWidget::toggleMaximized);
dynamic_cast<QHBoxLayout*>(titleBarWidget()->layout())->insertWidget(2, button);
}

void PanelDockWidget::toggleMaximized()
{
if (windowState() & Qt::WindowMaximized)
{
setFloating(false);
showNormal();
}
else
{
setFloating(true);
showMaximized();
}
}

void PanelDockWidget::closeEvent(QCloseEvent* /*event*/)
{
Q_EMIT closed();
Expand Down
2 changes: 2 additions & 0 deletions src/rviz/panel_dock_widget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ class RVIZ_EXPORT PanelDockWidget : public QDockWidget
void setCollapsed(bool collapsed);

void setIcon(const QIcon& icon);
void addMaximizeButton();

virtual void save(Config config);
virtual void load(const Config& config);
Expand All @@ -67,6 +68,7 @@ class RVIZ_EXPORT PanelDockWidget : public QDockWidget
public Q_SLOTS:

void setWindowTitle(const QString& title);
void toggleMaximized();

/** @ Override the visibility of the widget. **/
virtual void overrideVisibility(bool hide);
Expand Down
Loading