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

reduce beos frontend usage of plotter API

Browse Source
This commit is contained in:
Vincent Sanders 2016-05-04 21:19:43 +01:00
parent 42baec60cc
commit 09e90a4cea
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beos/fetch_rsrc.cpp
View File

@ -199,7 +199,7 @@ static bool fetch_rsrc_process(struct fetch_rsrc_context *c)
uint8 c1, c2, c3, c4; uint8 c1, c2, c3, c4;
if (sscanf(params, "%c%c%c%c", &c1, &c2, &c3, &c4) > 3) { if (sscanf(params, "%c%c%c%c", &c1, &c2, &c3, &c4) > 3) {
type = c1 << 24 | c2 << 16 | c3 << 8 | c4; type = c1 << 24 | c2 << 16 | c3 << 8 | c4;
LOG("fetch_rsrc: type:%4.4s\n", &type); LOG("fetch_rsrc: type:%4.4s\n", (char *)&type);
} }
} }

7
beos/font.h
View File

@ -16,16 +16,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** \file /**
* \file
* Beos font layout handling interface. * Beos font layout handling interface.
*/ */
#ifndef NS_BEOS_FONT_H #ifndef NS_BEOS_FONT_H
#define NS_BEOS_FONT_H #define NS_BEOS_FONT_H
#include <stdbool.h> #include "desktop/plot_style.h"
#include "desktop/plotters.h"
bool nsfont_paint(const plot_font_style_t *fstyle, bool nsfont_paint(const plot_font_style_t *fstyle,
const char *string, size_t length, const char *string, size_t length,

3
beos/scaffolding.h
View File

@ -25,11 +25,8 @@
#include <NetPositive.h> #include <NetPositive.h>
extern "C" { extern "C" {
#include "desktop/plotters.h"
struct hlcache_handle; struct hlcache_handle;
struct nsurl; struct nsurl;
} }
typedef struct beos_scaffolding nsbeos_scaffolding; typedef struct beos_scaffolding nsbeos_scaffolding;

18
beos/window.cpp
View File

@ -21,27 +21,28 @@
#define __STDBOOL_H__ 1 #define __STDBOOL_H__ 1
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
extern "C" { extern "C" {
#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
#include "content/content.h" #include "content/content.h"
#include "content/urldb.h" #include "content/urldb.h"
#include "desktop/browser.h" #include "desktop/browser.h"
#include "desktop/mouse.h" #include "desktop/mouse.h"
#include "utils/nsoption.h"
#include "desktop/textinput.h" #include "desktop/textinput.h"
#include "utils/log.h" #include "desktop/plotters.h"
#include "utils/utf8.h"
#include "utils/utils.h"
#include "desktop/mouse.h"
#include "desktop/gui_window.h" #include "desktop/gui_window.h"
#include "desktop/gui_clipboard.h" #include "desktop/gui_clipboard.h"
} }
#include "beos/about.h" #include "beos/about.h"
#include "beos/window.h" #include "beos/window.h"
#include "beos/font.h" #include "beos/font.h"
#include "beos/gui.h" #include "beos/gui.h"
#include "beos/scaffolding.h" #include "beos/scaffolding.h"
#include "beos/plotters.h" #include "beos/plotters.h"
//#include "beos/schedule.h"
#include <AppDefs.h> #include <AppDefs.h>
#include <BeBuild.h> #include <BeBuild.h>
@ -1092,7 +1093,10 @@ static void gui_window_update_extent(struct gui_window *g)
float y_prop = g->view->Bounds().Height() / y_max; float y_prop = g->view->Bounds().Height() / y_max;
x_max -= g->view->Bounds().Width() + 1; x_max -= g->view->Bounds().Width() + 1;
y_max -= g->view->Bounds().Height() + 1; y_max -= g->view->Bounds().Height() + 1;
LOG("x_max = %f y_max = %f x_prop = %f y_prop = %f\n", x_max, y_max, x_prop, y_prop);
LOG("x_max = %d y_max = %d x_prop = %f y_prop = %f\n",
x_max, y_max, x_prop, y_prop);
if (g->view->ScrollBar(B_HORIZONTAL)) { if (g->view->ScrollBar(B_HORIZONTAL)) {
g->view->ScrollBar(B_HORIZONTAL)->SetRange(0, x_max); g->view->ScrollBar(B_HORIZONTAL)->SetRange(0, x_max);
g->view->ScrollBar(B_HORIZONTAL)->SetProportion(x_prop); g->view->ScrollBar(B_HORIZONTAL)->SetProportion(x_prop);