loic/cgeditor
1
0
Fork 0
mirror of https://gitlab.com/manzerbredes/cgeditor.git synced 2025-04-05 17:46:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve code

Browse source
This commit is contained in:
Loic Guegan 2022-12-31 11:55:21 +01:00
parent 144a3ddfb5
commit bba54c3734
5 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CGEHalfMove.cpp
View file

@ -18,7 +18,7 @@ CGEHalfMove::CGEHalfMove(CGEHalfMove *parent) {
}
}
CGEHalfMove::CGEHalfMove(std::string move)
CGEHalfMove::CGEHalfMove(const std::string &move)
: MainLine(NULL), IsBlack(false), Number(0), Parent(NULL) {
this->move = move;
}

2
src/CGEHalfMove.hpp
View file

@ -14,7 +14,7 @@ class CGEHalfMove {
public:
CGEHalfMove();
CGEHalfMove(CGEHalfMove *parent);
CGEHalfMove(std::string move);
CGEHalfMove(const std::string &move);
/// @brief CUrrent move number
std::uint16_t Number;

4
src/components/Margin.cpp
View file

@ -21,8 +21,8 @@ void Margin::DrawMargin(Element e) {
elements.push_back(e);
}
void Margin::DrawMargin(std::vector<Element> elts) {
for(Element &e:elts){
void Margin::DrawMargin(const std::vector<Element> &elts) {
for(Element e:elts){
DrawMargin(e);
}
}

2
src/components/Margin.hpp
View file

@ -7,6 +7,6 @@ public:
Margin(Status *s);
void Refresh();
void DrawMargin(Element e);
void DrawMargin(std::vector<Element> elts);
void DrawMargin(const std::vector<Element> &elts);
};
} // namespace cgeditor

17
src/components/MoveTable.cpp
View file

@ -211,14 +211,14 @@ std::uint32_t MoveTable::DrawComment(CGEHalfMove *m, std::uint32_t line,
}
line++; // Goto the right line
/// ----- Compute comment bounding box values
/// ----- Compute comment bounding box values:
int nchar=m->comment.size();
int nline=ceil((double)nchar/(double)status->CommentCharPerLine);
std::uint16_t nrow=ceil(((nline*status->CommentCharHeight)+2*status->CommentPadding)/status->MoveHeight);
int width=status->CommentCharPerLine*status->CommentCharWidth+2*status->CommentPadding;
int height=nrow*status->MoveHeight;
// Draw comment background
// ----- Draw comment background:
Element e;
e.prop = Property::Rectangle | Property::Comment;
e.x = move_bound.x -
@ -229,19 +229,19 @@ std::uint32_t MoveTable::DrawComment(CGEHalfMove *m, std::uint32_t line,
e.height = height;
e.ShouldApplyScroll = true;
elements.push_back(e);
// Update scrolling
// ----- Update scrolling:
if ((e.x + width) > status->MoveTableMaxX) {
status->MoveTableMaxX = e.x + width;
}
if ((e.y + height) > status->MoveTableMaxY) {
status->MoveTableMaxY = e.y + height;
}
// Handle events:
// ----- Handle events:
if (status->LeftClick && IsMouseOver(e)) {
status->Events.push_back({Event::Type::CommentSelected, m});
}
// Now draw each lines of the comment:
Element l; // One line
// ----- Now draw each lines of the comment:
Element l; // One line of the comment
l.prop = Property::Comment|Property::Text;
l.x=e.x+status->CommentPadding;
l.y=e.y+status->CommentPadding;
@ -257,17 +257,16 @@ std::uint32_t MoveTable::DrawComment(CGEHalfMove *m, std::uint32_t line,
elements.push_back(l);
l.y+=status->CommentCharHeight;
}
// Do not forget to add marging before comment if indented:
// ----- Do not forget to add marging before comment if indented:
if (indent > 0) {
e.x -= status->MarginBarWidth;
VariationMargins.push_back(e);
}
line += nrow; // Skip right amount of lines
// Since we already increment line for black later on:
// ----- Since we already increment line for black later on:
if (m->IsBlack || m->variations.size() > 0) {
line--;
}
return (line);
}