mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-21 19:52:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

BeOS/Haiku: Disable replicant dragger

Browse Source 
* 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.
This commit is contained in:
Adrien Destugues 2015-08-17 20:43:43 +02:00 committed by Vincent Sanders
parent 0e606ac64b
commit 15777ee750
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
beos/scaffolding.cpp
View File

@ -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);