TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-11 13:35:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Complete odin resizing

Browse Source
This commit is contained in:
Baptiste Wicht 2018-03-27 09:12:10 +02:00
parent 46ff7b5d2e
commit 647d318a3e
1 changed files with 121 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
programs/odin/src/main.cpp
View File

@ -17,8 +17,14 @@
namespace { namespace {
constexpr const size_t min_window_height = 50; constexpr const size_t min_window_height = 100;
constexpr const size_t min_window_width = 50; constexpr const size_t min_window_width = 100;
constexpr const size_t border = 2;
constexpr const size_t title_padding = 2;
constexpr const size_t resize_margin = 2;
constexpr const size_t title_height = 18;
constexpr const size_t button_size = 12;
uint32_t* z_buffer = nullptr; uint32_t* z_buffer = nullptr;
@ -166,9 +172,9 @@ private:
int64_t drag_start_x = 0; int64_t drag_start_x = 0;
int64_t drag_start_y = 0; int64_t drag_start_y = 0;
bool resize = false; int64_t resize = 0;
int64_t resize_start_x = 0; uint64_t resize_start_x = 0;
int64_t resize_start_y = 0; uint64_t resize_start_y = 0;
public: public:
// TODO Relax std::vector to allow for non-default-constructible // TODO Relax std::vector to allow for non-default-constructible
@ -189,51 +195,97 @@ public:
window& operator=(const window& rhs) = default; window& operator=(const window& rhs) = default;
window& operator=(window&& rhs) = default; window& operator=(window&& rhs) = default;
void update() { void apply_resize(){
if(resize){
auto mouse_x = tlib::graphics::mouse_x();
auto mouse_y = tlib::graphics::mouse_y();
auto delta_x = int64_t(mouse_x) - resize_start_x;
auto delta_y = int64_t(mouse_y) - resize_start_y;
// A) Handle resize from left // A) Handle resize from left
if (resize_from_left(resize_start_x, resize_start_y)) { if (resize == 1) {
width += -delta_x; auto mouse_x = tlib::graphics::mouse_x();
if(-delta_x > x){ // Make it more natural
x = 2; if((resize_start_x < mouse_x || resize_start_x > x) && width == min_window_width){
} else { resize_start_x = mouse_x;
x += delta_x; return;
} }
width = std::max(width, min_window_width); auto delta_x = int64_t(mouse_x) - int64_t(resize_start_x);
width = std::min(width, sc_width - x - 3);
// Ensure x + delta_x >= 0
if( delta_x < 0 && size_t(-delta_x) > x){
delta_x = -x;
}
// Ensure width - delta_x >= 0
if( delta_x > 0 && size_t(delta_x) > width){
delta_x = width;
}
// Change the width if possible
auto prev_width = width;
width = std::clip(size_t(width - delta_x), min_window_width, sc_width - x - resize_margin);
// Move to the left if possible
delta_x = int64_t(prev_width) - int64_t(width);
x = std::clip(size_t(x + delta_x), resize_margin, sc_width - resize_margin);
// Save the new position
resize_start_x = mouse_x;
} }
// B) Handle resize from right // B) Handle resize from right
if (resize_from_right(resize_start_x, resize_start_y)) { if (resize == 2) {
width += delta_x; auto mouse_x = tlib::graphics::mouse_x();
width = std::max(width, min_window_width); // Make it more natural
width = std::min(width, sc_width - x - 3); if(resize_start_x < size_t(x + min_window_width)){
resize_start_x = mouse_x;
return;
}
auto delta_x = int64_t(mouse_x) - int64_t(resize_start_x);
// Ensure width + delta_x >= 0
if (delta_x < 0 && size_t(-delta_x) > width){
delta_x = -width;
}
// Change the width if possible
width = std::clip(size_t(width + delta_x), min_window_width, sc_width - x - resize_margin);
// Save the new position
resize_start_x = mouse_x;
} }
// C) Handle resize from bottom // C) Handle resize from bottom
if (resize_from_bottom(resize_start_x, resize_start_y)) { if (resize == 3) {
height += delta_y; auto mouse_y = tlib::graphics::mouse_y();
height = std::max(height, min_window_height); // Make it more natural
height = std::min(height, sc_height - y - 3); if(resize_start_y < size_t(y + min_window_height)){
resize_start_y = mouse_y;
return;
} }
// TODO Need to handle maximum minimum here! auto delta_y = int64_t(mouse_y) - int64_t(resize_start_y);
resize_start_x = mouse_x;
// Ensure height + delta_y >= 0
if (delta_y < 0 && size_t(-delta_y) > height){
delta_y = -height;
}
// Change the height if possible
height = std::clip(size_t(height + delta_y), min_window_height, sc_height - y - resize_margin);
// Save the new position
resize_start_y = mouse_y; resize_start_y = mouse_y;
} }
}
void update() {
if(resize){
apply_resize();
}
if (drag) { if (drag) {
auto mouse_x = tlib::graphics::mouse_x(); auto mouse_x = tlib::graphics::mouse_x();
@ -263,12 +315,6 @@ public:
} }
} }
static constexpr const size_t border = 2;
static constexpr const size_t title_padding = 2;
static constexpr const size_t resize_margin = 2;
static constexpr const size_t title_height = 18;
static constexpr const size_t button_size = 12;
void draw() const { void draw() const {
// Draw the background of the window // Draw the background of the window
@ -357,9 +403,20 @@ public:
void start_resize() { void start_resize() {
if (!resize) { if (!resize) {
resize = true;
resize_start_x = tlib::graphics::mouse_x(); resize_start_x = tlib::graphics::mouse_x();
resize_start_y = tlib::graphics::mouse_y(); resize_start_y = tlib::graphics::mouse_y();
if(resize_from_left(resize_start_x,resize_start_y)){
resize = 1;
}
if(resize_from_right(resize_start_x,resize_start_y)){
resize = 2;
}
if(resize_from_bottom(resize_start_x,resize_start_y)){
resize = 3;
}
} }
} }
@ -368,13 +425,26 @@ public:
} }
void stop_resize() { void stop_resize() {
resize = false; resize = 0;
}
size_t get_width() const {
return width;
}
size_t get_height() const {
return height;
} }
}; };
std::vector<window> windows; std::vector<window> windows;
void raise() { void raise() {
// If there are no windows, save some time
if(windows.empty()){
return;
}
auto mouse_x = tlib::graphics::mouse_x(); auto mouse_x = tlib::graphics::mouse_x();
auto mouse_y = tlib::graphics::mouse_y(); auto mouse_y = tlib::graphics::mouse_y();
@ -397,7 +467,9 @@ void raise() {
} // end of anonnymous namespace } // end of anonnymous namespace
int main(int /*argc*/, char* /*argv*/ []) { int main(int /*argc*/, char* /*argv*/ []) {
tlib::user_logf("odin: starts with %u windows", windows.size()); tlib::user_logf("odin: windows.size():%u", windows.size());
tlib::user_logf("odin: windows.capacity():%u", windows.capacity());
tlib::user_logf("odin: windows.data():%p", windows.data());
sc_width = tlib::graphics::get_width(); sc_width = tlib::graphics::get_width();
sc_height = tlib::graphics::get_height(); sc_height = tlib::graphics::get_height();
@ -456,7 +528,7 @@ int main(int /*argc*/, char* /*argv*/ []) {
size_t pos_x = position_dist(eng); size_t pos_x = position_dist(eng);
size_t pos_y = position_dist(eng); size_t pos_y = position_dist(eng);
windows.emplace_back(width, height, pos_x, pos_y); windows.emplace_back(pos_x, pos_y, width, height);
break; break;
} }