Strikethrough text style #352

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
5 participants
@Foaly
Contributor

Foaly commented Feb 14, 2013

Added a strikethrough text style to sf::Text. Fix for issue #243

@kimci86

This comment has been minimized.

Show comment Hide comment
@kimci86

kimci86 Feb 14, 2013

Contributor

The diff is awful.
Pay attention to the end of line character.
https://help.github.com/articles/dealing-with-line-endings

Contributor

kimci86 commented Feb 14, 2013

The diff is awful.
Pay attention to the end of line character.
https://help.github.com/articles/dealing-with-line-endings

@MarioLiebisch

This comment has been minimized.

Show comment Hide comment
@MarioLiebisch

MarioLiebisch Feb 14, 2013

Member

I'd blame the Github application for Windows (at least that's the reason I think). I've seen this behaviour before, when trying to commit something. At first the changes are shown properly, only the changed lines. But one you committed, the whole file is shown as changed. Using command line git since then without such issues.

Member

MarioLiebisch commented Feb 14, 2013

I'd blame the Github application for Windows (at least that's the reason I think). I've seen this behaviour before, when trying to commit something. At first the changes are shown properly, only the changed lines. But one you committed, the whole file is shown as changed. Using command line git since then without such issues.

@Foaly

This comment has been minimized.

Show comment Hide comment
@Foaly

Foaly Feb 15, 2013

Contributor

Yes you are right! I did use GitHub for Windows and in the client it showed up correctly, but when committing it to GitHub the line endings where wrong. I'll see if I can fix it. Unfortunately my computer crashed shortly afterwards and does bios beeps now... so it might take a little.

Contributor

Foaly commented Feb 15, 2013

Yes you are right! I did use GitHub for Windows and in the client it showed up correctly, but when committing it to GitHub the line endings where wrong. I'll see if I can fix it. Unfortunately my computer crashed shortly afterwards and does bios beeps now... so it might take a little.

Added a strikethrough text style.
Added a strikethrough test style to sf::Text. Fixes issue #243.
@Foaly

This comment has been minimized.

Show comment Hide comment
@Foaly

Foaly Feb 17, 2013

Contributor

Ok I think I finally got it! It took quiet some time, but i think everything is right now.

Contributor

Foaly commented Feb 17, 2013

Ok I think I finally got it! It took quiet some time, but i think everything is right now.

@pdinklag

This comment has been minimized.

Show comment Hide comment
@pdinklag

pdinklag Feb 18, 2013

Looking good!

Looking good!

@Foaly

This comment has been minimized.

Show comment Hide comment
@Foaly

Foaly Mar 6, 2013

Contributor

As I said earlier I had trouble with my computer. In the process of fix it my repositories got messed up bad. I had to delete my fork and start with a fresh copy. I noticed that this commit has a error (comma missing in the enum). I'm now not able to fix that anymore. I was able to set up everything correct and organize things a little better in branches.
So I'm going to close this pull request and open a new clean one. I am sorry about any inconvenience and confusion.

Contributor

Foaly commented Mar 6, 2013

As I said earlier I had trouble with my computer. In the process of fix it my repositories got messed up bad. I had to delete my fork and start with a fresh copy. I noticed that this commit has a error (comma missing in the enum). I'm now not able to fix that anymore. I was able to set up everything correct and organize things a little better in branches.
So I'm going to close this pull request and open a new clean one. I am sorry about any inconvenience and confusion.

@Foaly Foaly closed this Mar 6, 2013

@Foaly Foaly referenced this pull request Mar 6, 2013

Closed

Strikethrough text style #362

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment