From d73491e40e2121d5e7ecb189bb0d32ebf3c59b40 Mon Sep 17 00:00:00 2001
From: Francesco Abbate <francesco.bbt@gmail.com>
Date: 2010年8月23日 23:11:38 +0200
Subject: window drawing code rationalisation
---
 agg-plot/window.cpp &#124; 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)
(limited to 'agg-plot/window.cpp')
diff --git a/agg-plot/window.cpp b/agg-plot/window.cpp
index 7099dd21..85fdab76 100644
--- a/agg-plot/window.cpp
+++ b/agg-plot/window.cpp
@@ -96,12 +96,7 @@ window::draw_rec(ref::node *n)
 ref *ref = n->content();
 if (ref)
 {
- if (ref->plot)
-	{
-	 agg::trans_affine mtx(ref->matrix);
-	 this->scale(mtx);
-	 ref->plot->draw(*m_canvas, mtx);
-	}
+ draw_slot_by_ref (*ref, false);
 }
 }
 
@@ -125,6 +120,26 @@ window::ref* window::ref_lookup (ref::node *p, int slot_id)
 return NULL;
 }
 
+void window::draw_slot_by_ref(window::ref& ref, bool dirty)
+{
+ if (! ref.plot)
+ return;
+
+ agg::trans_affine mtx(ref.matrix);
+ this->scale(mtx);
+
+ if (dirty)
+ {
+ agg::rect_base<int> r = rect_of_slot_matrix(mtx);
+ m_canvas->clear_box(r);
+ ref.plot->draw(*m_canvas, mtx);
+ platform_support_update_region (this, r);
+ }
+ else
+ {
+ ref.plot->draw(*m_canvas, mtx);
+ }
+}
 
 void
 window::draw_slot(int slot_id, bool update_req)
@@ -132,16 +147,7 @@ window::draw_slot(int slot_id, bool update_req)
 ref *ref = window::ref_lookup (this->m_tree, slot_id);
 if (ref && m_canvas)
 {
- agg::trans_affine mtx(ref->matrix);
- this->scale(mtx);
-
- agg::rect_base<int> r = rect_of_slot_matrix(mtx);
- m_canvas->clear_box(r);
-
- ref->plot->draw(*m_canvas, mtx);
-
- if (update_req)
-	platform_support_update_region (this, r);
+ draw_slot_by_ref(*ref, update_req);
 }
 }
 
@@ -319,8 +325,6 @@ window_attach (lua_State *L)
 plot->slot_id = slot_id;
 
 win->draw_slot(slot_id, true);
- /* win->on_draw();
-	 win->update_window(); */
 
 win->unlock();
 
-- 
cgit v1.2.3
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://cgit.git.savannah.gnu.org/cgit/gsl-shell.git/patch/agg-plot/window.cpp?id=d73491e40e2121d5e7ecb189bb0d32ebf3c59b40">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://cgit.git.savannah.gnu.org/cgit/gsl-shell.git/patch/agg-plot/window.cpp?id=d73491e40e2121d5e7ecb189bb0d32ebf3c59b40" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>