hasufell/neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code style update

Browse Source
This commit is contained in:
daa 2016-05-03 13:34:36 +03:00
parent f2911beee3
commit d071cabce6
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/input.rs
View File

@ -30,13 +30,14 @@ pub fn convert_key(ev: &EventKey) -> Option<String> {
return Some(keyval_to_input_string(cnvt, state)); return Some(keyval_to_input_string(cnvt, state));
} }
} }
if let Some(ch) = gdk::keyval_to_unicode(keyval) { if let Some(ch) = gdk::keyval_to_unicode(keyval) {
return Some(if !state.is_empty() { Some(if !state.is_empty() {
keyval_to_input_string(&ch.to_string(), state) keyval_to_input_string(&ch.to_string(), state)
} else { } else {
ch.to_string() ch.to_string()
}); })
} else {
None
} }
None
} }

10
src/ui.rs
View File

@ -220,8 +220,7 @@ fn draw(ui: &Ui, ctx: &cairo::Context) {
} }
let fg = if let Some(ref fg) = cell.attrs.foreground { let fg = if let Some(ref fg) = cell.attrs.foreground {
fg fg
} } else {
else {
&ui.fg_color &ui.fg_color
}; };
ctx.set_source_rgb(fg.0, fg.1, fg.2); ctx.set_source_rgb(fg.0, fg.1, fg.2);
@ -313,8 +312,7 @@ impl RedrawEvents for Ui {
fn on_update_bg(&mut self, bg: i64) { fn on_update_bg(&mut self, bg: i64) {
if bg >= 0 { if bg >= 0 {
self.bg_color = split_color(bg as u64); self.bg_color = split_color(bg as u64);
} } else {
else {
self.bg_color = COLOR_BLACK; self.bg_color = COLOR_BLACK;
} }
} }
@ -322,12 +320,10 @@ impl RedrawEvents for Ui {
fn on_update_fg(&mut self, fg: i64) { fn on_update_fg(&mut self, fg: i64) {
if fg >= 0 { if fg >= 0 {
self.fg_color = split_color(fg as u64); self.fg_color = split_color(fg as u64);
} } else {
else {
self.fg_color = COLOR_WHITE; self.fg_color = COLOR_WHITE;
} }
} }
} }
fn split_color(indexed_color: u64) -> Color { fn split_color(indexed_color: u64) -> Color {