Fix size issues (#49)

* fix size issues * add padding
HaikuArchives · Jan 20, 2020 · d5e480a · d5e480a
1 parent df9f006
commit d5e480a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 24 deletions.
diff --git a/source/aklistview.h b/source/aklistview.h
@@ -8,7 +8,7 @@ class AKListView : public BListView
 	public:
 		AKListView  (const char* name,
 			list_view_type type = B_SINGLE_SELECTION_LIST,
-			uint32 flags = B_WILL_DRAW | B_NAVIGABLE | B_FRAME_EVENTS);
+			uint32 flags = B_WILL_DRAW | B_NAVIGABLE | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE);
 		~AKListView	();
 
 			virtual void	KeyDown(const char* bytes, int32 numBytes);

diff --git a/source/appview.cpp b/source/appview.cpp
@@ -88,7 +88,7 @@ AppView::InitView()
 
 	SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
-	m_pick_list_view = new PickListView("m_pick_list_view");
+	m_pick_list_view = new PickListView("m_pick_list_view", B_WILL_DRAW | B_FRAME_EVENTS );
 
 	AddOnView * aView;
 
@@ -128,12 +128,14 @@ AppView::InitView()
 		delete aView;
 #endif
 
-	m_list_view = new AKListView("m_list_view",B_MULTIPLE_SELECTION_LIST);
+	m_list_view = new AKListView("m_list_view", B_MULTIPLE_SELECTION_LIST, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE);
 	m_list_view->SetSelectionMessage(new BMessage(SELECTION_CHANGED));
 
-	m_scroll_view = new BScrollView("m_scroll_view",m_list_view, 0, true, true);
-	m_scroll_view->SetExplicitMinSize(BSize(300, 0));
-
+	m_scroll_view_right = new BScrollView("m_scroll_view_right", m_list_view, B_WILL_DRAW, true, true);
+
+	m_scroll_view_left = new BScrollView("m_scroll_view_left", m_pick_list_view, B_WILL_DRAW, false, true);
+	m_scroll_view_left->SetExplicitMinSize(BSize(0, 250));
+
 	m_selected_string_view = new BStringView("m_selected_string_view","");
 	m_selected_string_view->SetAlignment(B_ALIGN_RIGHT);
 	m_selected_string_view->SetFontSize(10);
@@ -153,12 +155,11 @@ AppView::InitView()
 
 	m_status_card = new BCardLayout();
 
-	BLayoutBuilder::Group<>(this, B_VERTICAL)
-		.SetInsets(B_USE_WINDOW_INSETS, 0, B_USE_WINDOW_INSETS,
-			B_USE_WINDOW_INSETS)
+	BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_DEFAULT_SPACING)
+		.SetInsets(B_USE_WINDOW_INSETS)
 		.AddGroup(B_HORIZONTAL)
-			.Add(m_pick_list_view)
-			.Add(m_scroll_view)
+			.Add(m_scroll_view_left)
+			.Add(m_scroll_view_right)
 		.End()
 		.AddGroup(B_HORIZONTAL)
 			.AddGlue()

diff --git a/source/appview.h b/source/appview.h
@@ -68,7 +68,8 @@ class AppView : public BView
 
 		PickListView*		m_pick_list_view;
 		AKListView*			m_list_view;
-		BScrollView*		m_scroll_view;
+		BScrollView*		m_scroll_view_right;
+		BScrollView*		m_scroll_view_left;
 		BStringView*		m_selected_string_view;
 
 		BButton*			m_reset_button;

diff --git a/source/appwindow.cpp b/source/appwindow.cpp
@@ -26,14 +26,12 @@
 #include "guistrings.h"
 #include "preferences.h"
 
-#define WIN_LEFT 200
-#define WIN_TOP 200
-#define WIN_RIGHT 700
-#define WIN_BOTTOM 600
-#define WIN_MIN_WIDTH 500
-#define WIN_MAX_WIDTH 2000
+#define WIN_LEFT 100
+#define WIN_TOP 100
+#define WIN_RIGHT 600
+#define WIN_BOTTOM 700
+#define WIN_MIN_WIDTH 550
 #define WIN_MIN_HEIGHT 400
-#define WIN_MAX_HEIGHT 2000
 
 AppWindow::AppWindow() : BWindow(BRect(WIN_LEFT,WIN_TOP,WIN_RIGHT,WIN_BOTTOM),
 	WIN_TITLE,B_TITLED_WINDOW,B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
@@ -152,6 +150,7 @@ AppWindow::InitWindow()
 	SetKeyMenuBar(m_menu_bar);
 
 	m_app_view = new AppView();
+	m_app_view->SetExplicitMinSize(BSize(WIN_MIN_WIDTH, WIN_MIN_HEIGHT));
 
 	BLayoutBuilder::Group<>(this, B_VERTICAL)
 		.Add(m_menu_bar)

diff --git a/source/picklistview.cpp b/source/picklistview.cpp
@@ -20,16 +20,21 @@ PickListView::PickListView(const char* name, uint32 flags, border_style border)
 	PRINT(("PickListView::PickListView(BRect,const char*,uint32,uint32,border_style)\n"));
 
 	m_selected_index = NO_VIEW_SELECTED;
-
+
+	m_view_box = new BBox("m_box_view", B_WILL_DRAW | B_FRAME_EVENTS, B_NO_BORDER);
+
 	m_view_menu = new BMenu("m_view_menu");
 	m_view_menu->SetLabelFromMarked(true);
-	SetLabel(new BMenuField("label", NULL, m_view_menu));
+	m_view_box->SetLabel(new BMenuField("label", NULL, m_view_menu));
 
 	m_view_layout = new BCardLayout();
 
 	m_card_view = new BView("m_card_view", 0, m_view_layout);
-
-	AddChild(m_card_view);
+
+	BLayoutBuilder::Group<>(this, B_VERTICAL, B_USE_ITEM_SPACING)
+		.SetInsets(0,10,0,10)
+		.Add(m_view_box)
+		.Add(m_card_view);
 }
 
 

diff --git a/source/picklistview.h b/source/picklistview.h
@@ -19,7 +19,7 @@ class PickListView : public BBox
 	public:
 		PickListView(const char* name = NULL,
 				uint32 flags = B_WILL_DRAW | B_NAVIGABLE_JUMP,
-				border_style border = B_FANCY_BORDER);
+				border_style border = B_NO_BORDER);
 		PickListView(BMessage* archive);
 		~PickListView();