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

Enhance: improve code for room custom exit lines in 2D map #2106

Merged
merged 6 commits into from Nov 17, 2018
Merged

Enhance: improve code for room custom exit lines in 2D map #2106

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b338861
Enhance: improve code for room custom exit lines in 2D map
SlySven Nov 5, 2018
e505a43
Revise: following up some points raise in peer review
SlySven Nov 6, 2018
7699a04
Revise: make addCustomLine & setExitWeight not case sensitive for exi…
SlySven Nov 11, 2018
6bd21ad
Test: attempt to fix MacOS Travis CI problem [skip appveyor]
SlySven Nov 14, 2018
e0230bd
BugFix: try and get both Mac and Linux Travis CI builds working
SlySven Nov 14, 2018
de768d7
BugFix: correct a stupid copy & paste typo I made
SlySven Nov 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
210 changes: 103 additions & 107 deletions src/T2DMap.cpp
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 9 additions & 4 deletions src/T2DMap.h
View file
Open in desktop
Expand Up @@ -135,12 +135,17 @@ class T2DMap : public QWidget
int mCustomLinesRoomFrom;
int mCustomLinesRoomTo;
QString mCustomLinesRoomExit;
QComboBox* mpCurrentLineStyle;
QString mCurrentLineStyle;
QPushButton* mpCurrentLineColor;

// Pointers to controls that hold the settings
QPointer<QComboBox> mpCurrentLineStyle;
QPointer<QPushButton> mpCurrentLineColor;
QPointer<QCheckBox> mpCurrentLineArrow;

// Variables that hold the current or last used setting:
Qt::PenStyle mCurrentLineStyle;
QColor mCurrentLineColor;
QCheckBox* mpCurrentLineArrow;
bool mCurrentLineArrow;

bool mBubbleMode;
bool mMapperUseAntiAlias;
bool mLabelHighlighted;
Expand Down