root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use std::unique_ptr in ToolBar members

This commit is contained in:
David Capello 2022-08-22 14:30:46 -03:00
parent 6df6037fdc
commit ad4d00ced2
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/ui/toolbar.cpp
View File

@ -94,9 +94,6 @@ ToolBar::ToolBar() : Widget(kGenericWidget), m_openedRecently(false), m_tipTimer
m_hotTool = NULL; m_hotTool = NULL;
m_hotIndex = NoneIndex; m_hotIndex = NoneIndex;
m_openOnHot = false; m_openOnHot = false;
m_popupWindow = NULL;
m_currentStrip = NULL;
m_tipWindow = NULL;
m_tipOpened = false; m_tipOpened = false;
m_minHeight = 0; m_minHeight = 0;
@ -112,9 +109,6 @@ ToolBar::ToolBar() : Widget(kGenericWidget), m_openedRecently(false), m_tipTimer
ToolBar::~ToolBar() ToolBar::~ToolBar()
{ {
App::instance()->activeToolManager()->remove_observer(this); App::instance()->activeToolManager()->remove_observer(this);
delete m_popupWindow;
delete m_tipWindow;
} }
bool ToolBar::isToolVisible(Tool* tool) bool ToolBar::isToolVisible(Tool* tool)
@ -465,7 +459,7 @@ void ToolBar::openPopupWindow(GroupType group_type, int group_index, tools::Tool
// In case this tool contains more than just one tool, show the popup window // In case this tool contains more than just one tool, show the popup window
m_openOnHot = true; m_openOnHot = true;
m_popupWindow = new TransparentPopupWindow( m_popupWindow = std::make_unique<TransparentPopupWindow>(
PopupWindow::ClickBehavior::CloseOnClickOutsideHotRegion); PopupWindow::ClickBehavior::CloseOnClickOutsideHotRegion);
m_closeConn = m_popupWindow->Close.connect([this] { onClosePopup(); }); m_closeConn = m_popupWindow->Close.connect([this] { onClosePopup(); });
m_openedRecently = true; m_openedRecently = true;
@ -486,7 +480,7 @@ void ToolBar::openPopupWindow(GroupType group_type, int group_index, tools::Tool
// Set hotregion of popup window // Set hotregion of popup window
m_popupWindow->setAutoRemap(false); m_popupWindow->setAutoRemap(false);
ui::fit_bounds(display(), m_popupWindow, rc); ui::fit_bounds(display(), m_popupWindow.get(), rc);
m_popupWindow->setBounds(rc); m_popupWindow->setBounds(rc);
Region rgn(m_popupWindow->boundsOnScreen().enlarge(16 * guiscale())); Region rgn(m_popupWindow->boundsOnScreen().enlarge(16 * guiscale()));
@ -500,8 +494,7 @@ void ToolBar::closePopupWindow()
{ {
if (m_popupWindow) { if (m_popupWindow) {
m_popupWindow->closeWindow(nullptr); m_popupWindow->closeWindow(nullptr);
delete m_popupWindow; m_popupWindow.reset();
m_popupWindow = nullptr;
} }
} }
@ -591,7 +584,7 @@ void ToolBar::openTipWindow(int group_index, Tool* tool)
else else
return; return;
m_tipWindow = new TipWindow(tooltip); m_tipWindow = std::make_unique<TipWindow>(tooltip);
m_tipWindow->remapWindow(); m_tipWindow->remapWindow();
Rect toolrc = getToolGroupBounds(group_index); Rect toolrc = getToolGroupBounds(group_index);
@ -613,8 +606,7 @@ void ToolBar::closeTipWindow()
if (m_tipWindow) { if (m_tipWindow) {
m_tipWindow->closeWindow(NULL); m_tipWindow->closeWindow(NULL);
delete m_tipWindow; m_tipWindow.reset();
m_tipWindow = NULL;
} }
} }
@ -651,7 +643,7 @@ void ToolBar::onClosePopup()
m_openOnHot = false; m_openOnHot = false;
m_hotTool = NULL; m_hotTool = NULL;
m_hotIndex = NoneIndex; m_hotIndex = NoneIndex;
m_currentStrip = NULL; m_currentStrip = nullptr;
invalidate(); invalidate();
} }

7
src/app/ui/toolbar.h
View File

@ -18,6 +18,7 @@
#include "ui/widget.h" #include "ui/widget.h"
#include <map> #include <map>
#include <memory>
namespace ui { namespace ui {
class CloseEvent; class CloseEvent;
@ -105,12 +106,12 @@ private:
bool m_openedRecently; bool m_openedRecently;
// Window displayed to show a tool-group // Window displayed to show a tool-group
ui::PopupWindow* m_popupWindow; std::unique_ptr<ui::PopupWindow> m_popupWindow;
class ToolStrip; class ToolStrip;
ToolStrip* m_currentStrip; ToolStrip* m_currentStrip = nullptr;
// Tool-tip window // Tool-tip window
ui::TipWindow* m_tipWindow; std::unique_ptr<ui::TipWindow> m_tipWindow;
ui::Timer m_tipTimer; ui::Timer m_tipTimer;
bool m_tipOpened; bool m_tipOpened;