Other small fixes.
This commit is contained in:
@@ -1,10 +1,25 @@
|
||||
#pragma once
|
||||
|
||||
#include <JUI/Widgets/Window.hpp>
|
||||
|
||||
namespace JUI
|
||||
{
|
||||
|
||||
|
||||
struct BindAction
|
||||
{
|
||||
std::string id;
|
||||
std::string display_name;
|
||||
std::vector<std::string> key_ids;
|
||||
};
|
||||
|
||||
class BindMenu : public Window {
|
||||
public:
|
||||
public:
|
||||
explicit BindMenu();
|
||||
|
||||
void AddAction(std::string id, std::string disp_name);
|
||||
|
||||
|
||||
};
|
||||
|
||||
}
|
@@ -19,8 +19,7 @@
|
||||
#include <JUI/Base/ImageBase.hpp>
|
||||
#include <JUI/Widgets/ImageButton.hpp>
|
||||
|
||||
namespace JUI
|
||||
{
|
||||
namespace JUI {
|
||||
// TODO: Find a nice way to implement a checkmark.
|
||||
|
||||
class CheckboxBase {
|
||||
|
@@ -52,11 +52,10 @@ void ScrollingRect::Draw() {
|
||||
|
||||
bool canvas_larger_than_widget = canvas_height > GetAbsoluteSize().y;
|
||||
|
||||
if (vertical_scrollbar_enabled && canvas_larger_than_widget)
|
||||
{
|
||||
if (vertical_scrollbar_enabled && canvas_larger_than_widget) {
|
||||
DrawVerticalScrollbar();
|
||||
}
|
||||
J2D::DrawString(Colors::Black, std::format("scroll {}, canvas {}", scroll, canvas_height), GetAbsolutePosition().x, GetAbsolutePosition().y, 1, 12);
|
||||
//J2D::DrawString(Colors::Black, std::format("scroll {}, canvas {}", scroll, canvas_height), GetAbsolutePosition().x, GetAbsolutePosition().y, 1, 12);
|
||||
}
|
||||
|
||||
Vector2 ScrollingRect::CanvasPosition() const {
|
||||
@@ -83,8 +82,8 @@ void ScrollingRect::InnerDraw() {
|
||||
Rect::InnerDraw();
|
||||
DrawChildWidgets();
|
||||
|
||||
J2D::DrawPoint(Colors::Blue, {1,1}, 2);
|
||||
J2D::DrawPoint(Colors::Blue, Vector2(GetAbsoluteSize()), 2);
|
||||
//J2D::DrawPoint(Colors::Blue, {1,1}, 2);
|
||||
//J2D::DrawPoint(Colors::Blue, Vector2(GetAbsoluteSize()), 2);
|
||||
|
||||
// Set our position back once we're done.
|
||||
Size(saved_size);
|
||||
|
Reference in New Issue
Block a user