takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add a configuration for padding

This commit is contained in:
Simon Gomizelj 2012-09-30 13:05:06 -04:00 committed by Daniel Micay
parent 2e3edd46bd
commit 4a87e93620
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
termite.cc
View File

@ -70,7 +70,7 @@ struct keybind_info {
struct hint_info {
PangoFontDescription *font;
cairo_pattern_t *fg, *bg, *border;
double border_width, roundness;
double padding, border_width, roundness;
};
static char *browser_cmd[3] = {NULL};
@ -169,7 +169,7 @@ static void draw_rectangle(cairo_t *cr, double x, double y, double height, doubl
cairo_close_path(cr);
}
static void draw_marker(cairo_t *cr, const PangoFontDescription *desc, long x, long y, int padding, unsigned id) {
static void draw_marker(cairo_t *cr, const PangoFontDescription *desc, long x, long y, unsigned id) {
char buffer[std::numeric_limits<unsigned>::digits10 + 1];
cairo_text_extents_t ext;
int width, height;
@ -183,8 +183,8 @@ static void draw_marker(cairo_t *cr, const PangoFontDescription *desc, long x, l
pango_layout_get_size (layout, &width, &height);
draw_rectangle(cr, static_cast<double>(x), static_cast<double>(y),
static_cast<double>(width / PANGO_SCALE + padding * 2),
static_cast<double>(height / PANGO_SCALE + padding * 2));
static_cast<double>(width / PANGO_SCALE) + hints.padding * 2,
static_cast<double>(height / PANGO_SCALE) + hints.padding * 2);
cairo_set_source(cr, hints.border);
cairo_set_line_width(cr, hints.border_width);
cairo_stroke_preserve(cr);
@ -192,7 +192,8 @@ static void draw_marker(cairo_t *cr, const PangoFontDescription *desc, long x, l
cairo_fill(cr);
cairo_new_path(cr);
cairo_move_to(cr, static_cast<double>(x + padding), static_cast<double>(y + padding));
cairo_move_to(cr, static_cast<double>(x) + hints.padding,
static_cast<double>(y) + hints.padding);
cairo_set_source(cr, hints.fg);
pango_cairo_update_layout(cr, layout);
@ -216,7 +217,7 @@ static gboolean draw_cb(const search_panel_info *info, cairo_t *cr) {
const url_data &data = info->url_list[i];
const long x = data.col * cw;
const long y = data.row * ch;
draw_marker(cr, desc, x, y, 2, i + 1);
draw_marker(cr, desc, x, y, i + 1);
}
}
@ -1061,6 +1062,10 @@ static void load_config(GtkWindow *window, VteTerminal *vte, config_info *info,
hints.border = hints.fg;
}
if (!get_config_double(config, "hints", "padding", &hints.padding)) {
hints.padding = 2.0;
}
if (!get_config_double(config, "hints", "border_width", &hints.border_width)) {
hints.border_width = 1.0;
}

3
termite.cfg
View File

@ -64,6 +64,7 @@ color15 = #ffffff
#font = Monospace 12
#foreground = #dcdccc
#background = #3f3f3f
#padding = 2
#border = #3f3f3f
#border_width = 0.5
#roundness = 2.0
#roundness = 2.0