summaryrefslogtreecommitdiff
path: root/beos
diff options
context:
space:
mode:
authorAdrien Destugues <pulkomandy@pulkomandy.tk>2015-08-17 20:43:43 +0200
committerVincent Sanders <vince@kyllikki.org>2015-10-12 21:09:44 +0100
commit15777ee7503db5a8499ff7c8423415ef1d13a1a5 (patch)
tree999e51a4e12ede7e633d8cc55495321fa979d1a4 /beos
parent0e606ac64b28cde3985fed15e29bfdfdb3070192 (diff)
downloadnetsurf-15777ee7503db5a8499ff7c8423415ef1d13a1a5.tar.gz
netsurf-15777ee7503db5a8499ff7c8423415ef1d13a1a5.tar.bz2
BeOS/Haiku: Disable replicant dragger
* While making NetSurf replicable is nice, it doesn't work at all * The dragger is not useful: the main interest of replicability is apps programmatically embedding NetSurf, rather than manually dragging it around. * I leave this around if mmu_man wants to fix and re-enable it, but under a define so it doesn't get in the way for release builds. Fixes http://bugs.netsurf-browser.org/mantis/view.php?id=2163.
Diffstat (limited to 'beos')
-rw-r--r--beos/scaffolding.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp
index b64bdcaee..678d6db91 100644
--- a/beos/scaffolding.cpp
+++ b/beos/scaffolding.cpp
@@ -98,7 +98,9 @@ struct beos_scaffolding {
BPopUpMenu *popup_menu;
+#ifdef ENABLE_DRAGGER
BDragger *dragger;
+#endif
BView *tool_bar;
@@ -670,7 +672,9 @@ NSBaseView::AllAttached()
g->throbber->SetViewColor(c);
g->scroll_view->SetViewColor(c);
+#ifdef ENABLE_DRAGGER
g->dragger->SetViewColor(c);
+#endif
g->status_bar->SetViewColor(c);
g->status_bar->SetLowColor(c);
@@ -805,7 +809,9 @@ static void nsbeos_scaffolding_update_colors(nsbeos_scaffolding *g)
g->throbber->SetViewColor(c);
g->scroll_view->SetViewColor(c);
+#ifdef ENABLE_DRAGGER
g->dragger->SetViewColor(c);
+#endif
g->status_bar->SetViewColor(c);
g->status_bar->SetLowColor(c);
@@ -2005,6 +2011,7 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
g->popup_menu = new BPopUpMenu("");
+#ifdef ENABLE_DRAGGER
// the dragger to allow replicating us
// XXX: try to stuff it in the status bar at the bottom
// (BDragger *must* be a parent, sibiling or direct child of NSBaseView!)
@@ -2016,6 +2023,7 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
g->top_view->AddChild(g->dragger);
g->dragger->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
g->dragger->SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR)) ;
+#endif
// tool_bar
// the toolbar is also the dragger for now
@@ -2025,7 +2033,11 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
// but causes flicker
rect = g->top_view->Bounds();
rect.bottom = rect.top + TOOLBAR_HEIGHT - 1;
+#ifdef ENABLE_DRAGGER
rect.right = rect.right - DRAGGER_WIDTH;
+#else
+ rect.right = rect.right + 1;
+#endif
g->tool_bar = new BBox(rect, "Toolbar",
B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP, B_WILL_DRAW | B_FRAME_EVENTS
| B_FULL_UPDATE_ON_RESIZE | B_NAVIGABLE_JUMP, B_PLAIN_BORDER);