Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-06 19:01:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

improved scene element visibility buttons

Browse source
This commit is contained in:
Marc Zinnschlag 2016-04-23 13:54:19 +02:00
parent 5c8756cb2c
commit 091e1bf25d
6 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/opencs/view/render/pagedworldspacewidget.cpp
View file

@ -11,7 +11,7 @@
#include "../../model/world/tablemimedata.hpp"
#include "../../model/world/idtable.hpp"
#include "../widget/scenetooltoggle.hpp"
#include "../widget/scenetooltoggle2.hpp"
#include "../widget/scenetoolmode.hpp"
#include "../widget/scenetooltoggle2.hpp"
@ -581,16 +581,15 @@ void CSVRender::PagedWorldspaceWidget::reset (unsigned int elementMask)
iter->second->reset (elementMask);
}
CSVWidget::SceneToolToggle *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
CSVWidget::SceneToolToggle2 *CSVRender::PagedWorldspaceWidget::makeControlVisibilitySelector (
CSVWidget::SceneToolbar *parent)
{
mControlElements = new CSVWidget::SceneToolToggle (parent,
"Controls & Guides Visibility", ":placeholder");
mControlElements = new CSVWidget::SceneToolToggle2 (parent,
"Controls & Guides Visibility", ":scenetoolbar/scene-view-marker-c", ":scenetoolbar/scene-view-marker-");
mControlElements->addButton (":placeholder", Mask_CellMarker, ":placeholder",
"Cell marker");
mControlElements->addButton (":placeholder", Mask_CellArrow, ":placeholder", "Cell arrows");
mControlElements->addButton (":scenetoolbar/grid", Mask_CellBorder, ":scenetoolbar/grid-small", "Cell border");
mControlElements->addButton (1, Mask_CellMarker, "Cell Marker");
mControlElements->addButton (2, Mask_CellArrow, "Cell Arrows");
mControlElements->addButton (4, Mask_CellBorder, "Cell Border");
mControlElements->setSelectionMask (0xffffffff);

5
apps/opencs/view/render/pagedworldspacewidget.hpp
View file

@ -11,6 +11,7 @@
namespace CSVWidget
{
class SceneToolToggle;
class SceneToolToggle2;
}
namespace CSVRender
@ -26,7 +27,7 @@ namespace CSVRender
CSMWorld::CellSelection mSelection;
std::map<CSMWorld::CellCoordinates, Cell *> mCells;
std::string mWorldspace;
CSVWidget::SceneToolToggle *mControlElements;
CSVWidget::SceneToolToggle2 *mControlElements;
bool mDisplayCellCoord;
private:
@ -90,7 +91,7 @@ namespace CSVRender
/// \attention The created tool is not added to the toolbar (via addTool). Doing
/// that is the responsibility of the calling function.
virtual CSVWidget::SceneToolToggle *makeControlVisibilitySelector (
virtual CSVWidget::SceneToolToggle2 *makeControlVisibilitySelector (
CSVWidget::SceneToolbar *parent);
virtual unsigned int getVisibilityMask() const;

2
apps/opencs/view/world/scenesubview.cpp
View file

@ -112,7 +112,7 @@ CSVWidget::SceneToolbar* CSVWorld::SceneSubView::makeToolbar (CSVRender::Worldsp
if (type==widget_Paged)
{
CSVWidget::SceneToolToggle *controlVisibilityTool =
CSVWidget::SceneToolToggle2 *controlVisibilityTool =
dynamic_cast<CSVRender::PagedWorldspaceWidget&> (*widget).
makeControlVisibilitySelector (toolbar);