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

fixup errors in font layout table conversion

Browse Source
This commit is contained in:
Vincent Sanders 2016-04-24 20:38:30 +01:00
parent 5c567d4f20
commit 9ce01d2024
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
beos/bitmap.cpp
View File

@ -42,7 +42,6 @@ extern "C" {
#include "content/urldb.h" #include "content/urldb.h"
#include "desktop/plotters.h" #include "desktop/plotters.h"
#include "desktop/browser.h" #include "desktop/browser.h"
#include "desktop/font.h"
#include "image/bitmap.h" #include "image/bitmap.h"
} }

9
beos/font.cpp
View File

@ -36,7 +36,6 @@ extern "C" {
#include "utils/log.h" #include "utils/log.h"
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "utils/nsurl.h" #include "utils/nsurl.h"
#include "desktop/gui_layout.h" #include "desktop/gui_layout.h"
} }
@ -287,7 +286,7 @@ static nserror beos_font_split(const plot_font_style_t *fstyle,
if (x < current && last_space != 0) { if (x < current && last_space != 0) {
*actual_x = (int)last_x; *actual_x = (int)last_x;
*char_offset = last_space; *char_offset = last_space;
return true; return NSERROR_OK;;
} }
esc += escapements[i]; esc += escapements[i];
current = font.Size() * esc; current = font.Size() * esc;
@ -367,9 +366,9 @@ bool nsfont_paint(const plot_font_style_t *fstyle,
static struct gui_layout_table layout_table = { static struct gui_layout_table layout_table = {
.width = beos_font_width, /*.width = */beos_font_width,
.position = beos_font_position, /*.position = */beos_font_position,
.split = beos_font_split, /*.split = */beos_font_split
}; };
struct gui_layout_table *beos_layout_table = &layout_table; struct gui_layout_table *beos_layout_table = &layout_table;

9
beos/font.h
View File

@ -17,9 +17,12 @@
*/ */
/** \file /** \file
* Font handling (GTK interface). * Beos font layout handling interface.
*/ */
#ifndef NS_BEOS_FONT_H
#define NS_BEOS_FONT_H
#include <stdbool.h> #include <stdbool.h>
#include "desktop/plotters.h" #include "desktop/plotters.h"
@ -30,4 +33,6 @@ bool nsfont_paint(const plot_font_style_t *fstyle,
void nsbeos_style_to_font(BFont &font, const struct plot_font_style *fstyle); void nsbeos_style_to_font(BFont &font, const struct plot_font_style *fstyle);
struct gui_layout_table *beos_layout_table; extern struct gui_layout_table *beos_layout_table;
#endif

1
beos/plotters.cpp
View File

@ -32,7 +32,6 @@
#include <Shape.h> #include <Shape.h>
extern "C" { extern "C" {
#include "desktop/plotters.h" #include "desktop/plotters.h"
#include "desktop/font.h"
#include "utils/log.h" #include "utils/log.h"
#include "utils/utils.h" #include "utils/utils.h"
#include "utils/nsoption.h" #include "utils/nsoption.h"

1
beos/scaffolding.cpp
View File

@ -62,7 +62,6 @@ extern "C" {
#include "desktop/plotters.h" #include "desktop/plotters.h"
#include "utils/nsoption.h" #include "utils/nsoption.h"
#include "desktop/textinput.h" #include "desktop/textinput.h"
#include "desktop/font.h"
#include "render/form.h" #include "render/form.h"
#include "utils/messages.h" #include "utils/messages.h"
#include "utils/utils.h" #include "utils/utils.h"