Ruby GTK3移行後のメインリポジトリ
Revision | b33402d4dcff2177eaf2cc9c748d4506f29917fa (tree) |
---|---|
Time | 2015-03-12 23:24:46 |
Author | Shyouzou Sugitani <shy@user...> |
Commiter | Shyouzou Sugitani |
update balloon.rb
@@ -77,7 +77,7 @@ module Balloon | ||
77 | 77 | |
78 | 78 | def get_window(side) |
79 | 79 | if @window.length > side |
80 | - return @window[side].window ## FIXME | |
80 | + return @window[side].get_window ## FIXME | |
81 | 81 | else |
82 | 82 | return nil |
83 | 83 | end |
@@ -109,7 +109,7 @@ module Balloon | ||
109 | 109 | |
110 | 110 | def identify_window(win) |
111 | 111 | for balloon_window in @window |
112 | - if win == balloon_window.window.window | |
112 | + if win == balloon_window.get_window.window | |
113 | 113 | return true |
114 | 114 | end |
115 | 115 | end |
@@ -237,7 +237,7 @@ module Balloon | ||
237 | 237 | rescue # except: |
238 | 238 | default_id = 0 |
239 | 239 | end |
240 | - for side in range(@window.length) | |
240 | + for side in 0..@window.length-1 | |
241 | 241 | @window[side].set_balloon(default_id) |
242 | 242 | end |
243 | 243 | end |
@@ -263,7 +263,7 @@ module Balloon | ||
263 | 263 | end |
264 | 264 | |
265 | 265 | def set_autoscroll(flag) |
266 | - for side in range(@window.length) | |
266 | + for side in 0..@window.length-1 | |
267 | 267 | @window[side].set_autoscroll(flag) |
268 | 268 | end |
269 | 269 | end |
@@ -283,7 +283,7 @@ module Balloon | ||
283 | 283 | end |
284 | 284 | |
285 | 285 | def hide_all |
286 | - for side in range(@window.length) | |
286 | + for side in 0..@window.length-1 | |
287 | 287 | @window[side].hide() |
288 | 288 | end |
289 | 289 | end |
@@ -295,7 +295,7 @@ module Balloon | ||
295 | 295 | end |
296 | 296 | |
297 | 297 | def raise_all |
298 | - for side in range(@window.length) | |
298 | + for side in 0..@window.length-1 | |
299 | 299 | @window[side].raise_() |
300 | 300 | end |
301 | 301 | end |
@@ -307,7 +307,7 @@ module Balloon | ||
307 | 307 | end |
308 | 308 | |
309 | 309 | def lower_all |
310 | - for side in range(@window.length) | |
310 | + for side in 0..@window.length-1 | |
311 | 311 | @window[side].lower() |
312 | 312 | end |
313 | 313 | end |
@@ -323,7 +323,7 @@ module Balloon | ||
323 | 323 | end |
324 | 324 | |
325 | 325 | def clear_text_all |
326 | - for side in range(@window.length) | |
326 | + for side in 0..@window.length-1 | |
327 | 327 | clear_text(side) |
328 | 328 | end |
329 | 329 | end |
@@ -561,6 +561,10 @@ module Balloon | ||
561 | 561 | clear_text() |
562 | 562 | end |
563 | 563 | |
564 | + def get_window | |
565 | + return @window | |
566 | + end | |
567 | + | |
564 | 568 | def set_responsible(parent) |
565 | 569 | @parent = parent |
566 | 570 | end |
@@ -1171,7 +1175,7 @@ module Balloon | ||
1171 | 1175 | if @lineno <= sl <= @lineno + @lines |
1172 | 1176 | sn = @link_buffer[index][1] |
1173 | 1177 | en = @link_buffer[index][3] |
1174 | - for n in range(sl, el + 1) | |
1178 | + for n in sl..el | |
1175 | 1179 | if n - @lineno >= @line_regions.length |
1176 | 1180 | break |
1177 | 1181 | x, y, w, h = @line_regions[n - @lineno] |
@@ -1235,7 +1239,7 @@ module Balloon | ||
1235 | 1239 | if @lineno <= sl <= @lineno + @lines |
1236 | 1240 | sn = @link_buffer[i][1] |
1237 | 1241 | en = @link_buffer[i][3] |
1238 | - for n in range(sl,el + 1) | |
1242 | + for n in sl..el | |
1239 | 1243 | if n - @lineno >= @line_regions.length |
1240 | 1244 | break |
1241 | 1245 | end |
@@ -1539,7 +1543,7 @@ module Balloon | ||
1539 | 1543 | el = @text_buffer.length - 1 |
1540 | 1544 | en = @text_buffer[-1].length |
1541 | 1545 | end |
1542 | - for i in range(@link_buffer.length) | |
1546 | + for i in 0..@link_buffer.length-1 | |
1543 | 1547 | if @link_buffer[i][4] == link_id |
1544 | 1548 | sl = @link_buffer[i][0] |
1545 | 1549 | sn = @link_buffer[i][1] |